@nokecy/qc-ui 1.1.87 → 1.1.88

package/dist/esm/ag-grid-plus/queryForm/schemaKey.d.ts

@@ -1,19 +1,26 @@
 type ColumnStateLike = {
     colId?: string | null;
+    hide?: boolean | null;
 };
 type QueryColumnLike = {
     field?: string;
+    colId?: string;
+    queryField?: string;
     headerName?: string;
-    searchComponentProps?: {
-        options?: readonly {
-            value?: unknown;
-            label?: unknown;
-        }[];
-    };
+    searchTitle?: string;
+    hide?: boolean;
+    hideInSearch?: boolean;
+    hideInTable?: boolean;
+    visible?: boolean;
+    filter?: unknown;
+    type?: unknown;
+    enum?: unknown;
+    searchComponent?: unknown;
+    searchComponentProps?: unknown;
 };
 /**
- * 查询区 schema 的重建键：列（id、字段、标题）或下拉选项变了才重建。
- * 下拉选项常在首帧之后才到（如从基础资料接口取名称），只看列与标题时选项停在首帧。
+ * 查询区只在有效查询元数据变化时更新 schema，列宽、固定位置和排序不参与。
+ * 接受列状态参数以兼容原调用方；表单传入已经合并状态的有效查询列快照。
  * @author nokecy
  */
 export declare const queryFormSchemaKey: (columnStates?: readonly ColumnStateLike[] | null, colDefs?: readonly QueryColumnLike[] | null) => string;

package/dist/esm/ag-grid-plus/queryForm/schemaKey.js

@@ -1,19 +1,71 @@
-var optionsSignature = function optionsSignature(options) {
-  return Array.isArray(options) ? options.map(function (option) {
-    return "".concat(String(option === null || option === void 0 ? void 0 : option.value), "=").concat(String(option === null || option === void 0 ? void 0 : option.label));
-  }).join(',') : '';
+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 referenceIds = new WeakMap();
+var nextReferenceId = 1;
+
+/** 保持组件、回调及非普通对象的引用标识稳定。@author nokecy */
+var referenceKey = function referenceKey(value) {
+  if (!referenceIds.has(value)) referenceIds.set(value, nextReferenceId++);
+  return referenceIds.get(value);
+};
+
+/**
+ * 对查询元数据生成稳定签名：普通对象按内容比较，组件与回调按引用比较。
+ * 排除 React 元素的内部 owner；循环引用只终止当前分支。
+ * @author nokecy
+ */
+var metadataKey = function metadataKey(value) {
+  var ancestors = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new Set();
+  if (typeof value === 'function') return "function:".concat(referenceKey(value));
+  if (value === null || _typeof(value) !== 'object') return "".concat(_typeof(value), ":").concat(JSON.stringify(String(value)));
+  if (ancestors.has(value)) return 'circular';
+  if (value instanceof Date) return "date:".concat(value.getTime());
+  var nextAncestors = new Set(ancestors).add(value);
+  if (Array.isArray(value)) return "[".concat(value.map(function (item) {
+    return metadataKey(item, nextAncestors);
+  }).join(','), "]");
+  var prototype = Object.getPrototypeOf(value);
+  if (prototype !== Object.prototype && prototype !== null) return "reference:".concat(referenceKey(value));
+  var object = value;
+  var keys = Object.keys(object).filter(function (key) {
+    return !object.$$typeof || key !== '_owner';
+  }).sort();
+  return "{".concat(keys.map(function (key) {
+    return "".concat(JSON.stringify(key), ":").concat(metadataKey(object[key], nextAncestors));
+  }).join(','), "}");
 };
 
 /**
- * 查询区 schema 的重建键：列（id、字段、标题）或下拉选项变了才重建。
- * 下拉选项常在首帧之后才到（如从基础资料接口取名称），只看列与标题时选项停在首帧。
+ * 查询区只在有效查询元数据变化时更新 schema，列宽、固定位置和排序不参与。
+ * 接受列状态参数以兼容原调用方；表单传入已经合并状态的有效查询列快照。
  * @author nokecy
  */
 export var queryFormSchemaKey = function queryFormSchemaKey(columnStates, colDefs) {
-  return [columnStates === null || columnStates === void 0 ? void 0 : columnStates.map(function (column) {
-    return column.colId;
-  }).join('|'), colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (column) {
-    var _column$searchCompone;
-    return "".concat(column.field, "|").concat(column.headerName, "|").concat(optionsSignature((_column$searchCompone = column.searchComponentProps) === null || _column$searchCompone === void 0 ? void 0 : _column$searchCompone.options));
-  }).join('|')].join('#');
+  return metadataKey({
+    states: columnStates === null || columnStates === void 0 ? void 0 : columnStates.map(function (_ref) {
+      var colId = _ref.colId,
+        hide = _ref.hide;
+      return {
+        colId: colId,
+        hide: hide
+      };
+    }),
+    columns: colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (column) {
+      var _column$searchTitle;
+      return {
+        field: column.field,
+        colId: column.colId,
+        queryField: column.queryField,
+        title: (_column$searchTitle = column.searchTitle) !== null && _column$searchTitle !== void 0 ? _column$searchTitle : column.headerName,
+        hide: column.hide,
+        hideInSearch: column.hideInSearch,
+        hideInTable: column.hideInTable,
+        visible: column.visible,
+        filter: column.filter,
+        type: column.type,
+        enum: column.enum,
+        searchComponent: column.searchComponent,
+        searchComponentProps: column.searchComponentProps
+      };
+    })
+  });
 };

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

@@ -122,6 +122,9 @@ var ColumnConfigForm = function ColumnConfigForm(_ref) {
   }), /*#__PURE__*/React.createElement(SchemaField.String, {
     name: "field",
     "x-display": "hidden"
+  }), /*#__PURE__*/React.createElement(SchemaField.String, {
+    name: "colId",
+    "x-display": "hidden"
   }), /*#__PURE__*/React.createElement(SchemaField.Boolean, {
     name: "_isNew",
     "x-display": "hidden"

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

@@ -7,16 +7,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 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 _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 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); }
@@ -33,7 +33,7 @@ import { AgGridReact } from 'ag-grid-react';
 import { useAgGridTheme } from "../theme";
 import { localeText } from "../locale";
 import { createForm, onFormInit } from '@formily/core';
-import { gridStateToFlatConfig, flatConfigToGridState, flatConfigToColumnState, dropQueryOnlyItems, excludeQueryOnlyColumns, isOldSchemeData, migrateOldScheme, generateId } from "./columnGroupUtils";
+import { gridStateToFlatConfig, flatConfigToGridState, flatConfigToColumnState, dropQueryOnlyItems, excludeQueryOnlyColumns, isOldSchemeData, migrateOldScheme, generateId, getColumnIdentity, normalizeColumnConfig } from "./columnGroupUtils";
 import ColumnConfigTable from "./ColumnConfigTable";
 import DraggableModal from "../../draggableModal";
 import { useGridSchemes } from "../context/useSchemeManager";
@@ -139,47 +139,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
     if (!originalColumnDefs || originalColumnDefs.length === 0) {
       return items;
     }
-
-    // 递归查找 originalColumnDefs 中指定 field 的 headerName
-    var findOriginalHeaderName = function findOriginalHeaderName(field) {
-      var _iterator = _createForOfIteratorHelper(originalColumnDefs),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var def = _step.value;
-          // 检查分组
-          if ('children' in def && def.children) {
-            for (var _i = 0, _arr = def.children; _i < _arr.length; _i++) {
-              var child = _arr[_i];
-              if (child.field === field) {
-                return child.headerName;
-              }
-            }
-          } else {
-            // 检查普通列
-            if (def.field === field) {
-              return def.headerName;
-            }
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-      return undefined;
-    };
-    return items.map(function (item) {
-      if (item.type === 'column' && item.field) {
-        var originalHeaderName = findOriginalHeaderName(item.field);
-        if (originalHeaderName) {
-          return _objectSpread(_objectSpread({}, item), {}, {
-            originalHeaderName: originalHeaderName
-          });
-        }
-      }
-      return item;
-    });
+    return normalizeColumnConfig(items, originalColumnDefs);
   }, [originalColumnDefs]);
 
   /**
@@ -195,9 +155,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
     // 创建 field -> config item 的映射（用于快速查找已保存的列配置）
     var existingFields = new Set();
     config.filter(function (item) {
-      return item.type === 'column' && item.field;
+      return item.type === 'column' && getColumnIdentity(item);
     }).forEach(function (item) {
-      existingFields.add(item.field);
+      existingFields.add(getColumnIdentity(item));
     });
 
     // 创建 groupId -> config item 的映射（用于快速查找已保存的分组配置）
@@ -218,11 +178,11 @@ var ColumnSetting = function ColumnSetting(_ref) {
      * 递归处理列定义，查找新增的列和分组
      */
     var findNewColumns = function findNewColumns(defs, level, parentId) {
-      var _iterator2 = _createForOfIteratorHelper(defs),
-        _step2;
+      var _iterator = _createForOfIteratorHelper(defs),
+        _step;
       try {
         var _loop = function _loop() {
-          var def = _step2.value;
+          var def = _step.value;
           // 检查是否是分组
           if ('children' in def && def.children && def.children.length > 0) {
             var groupDef = def;
@@ -253,8 +213,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
           } else {
             // 普通列
             var colDef = def;
-            if (!colDef.field) return 1; // continue
-            if (!existingFields.has(colDef.field)) {
+            var columnId = getColumnIdentity(colDef);
+            if (!columnId) return 1; // continue
+            if (!existingFields.has(columnId)) {
               // 新列 - 追加到末尾
               newItems.push({
                 id: generateId(),
@@ -263,6 +224,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
                 level: level,
                 order: ++maxOrder,
                 field: colDef.field,
+                colId: colDef.colId,
                 headerName: colDef.headerName || colDef.field || '未命名列',
                 originalHeaderName: colDef.headerName || colDef.field || '未命名列',
                 width: colDef.width,
@@ -275,13 +237,13 @@ var ColumnSetting = function ColumnSetting(_ref) {
             }
           }
         };
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
           if (_loop()) continue;
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator.e(err);
       } finally {
-        _iterator2.f();
+        _iterator.f();
       }
     };
 
@@ -324,9 +286,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
     // 同步列状态（宽度、隐藏等）
     flatConfig = flatConfig.map(function (item) {
-      if (item.type === 'column' && item.field) {
+      if (item.type === 'column' && getColumnIdentity(item)) {
         var _state = columnStates.find(function (s) {
-          return s.colId === item.field;
+          return s.colId === getColumnIdentity(item);
         });
         if (_state) {
           // 处理 pinned: 可能是 true/false/null/'left'/'right'
@@ -398,7 +360,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
     // 3. 立即应用到 Grid(实时预览,不保存到方案)
     // 【修复】同时应用列顺序和状态，确保拖拽排序能够生效
-    var columnState = flatConfigToColumnState(newItems);
+    var columnState = flatConfigToColumnState(newItems, allColDefs);
     gridApi.applyColumnState({
       state: columnState,
       applyOrder: true // 强制应用列顺序
@@ -451,7 +413,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
             });
           case 10:
             // 【修复】然后应用列状态（宽度、隐藏、顺序等）
-            columnState = flatConfigToColumnState(scheme.columnConfig);
+            columnState = flatConfigToColumnState(scheme.columnConfig, allColDefs);
             gridApi.applyColumnState({
               state: columnState,
               applyOrder: true // 强制应用列顺序
@@ -517,29 +479,30 @@ var ColumnSetting = function ColumnSetting(_ref) {
           }
 
           // 验证数据完整性，过滤掉无效的列配置
+          configToSave = normalizeColumnConfig(configToSave, allColDefs);
           invalidColumns = configToSave.filter(function (item) {
-            return item.type === 'column' && item.field !== "" && !item.field;
+            return item.type === 'column' && !getColumnIdentity(item);
           });
           if (invalidColumns.length > 0) {
-            message.warning("\u68C0\u6D4B\u5230 ".concat(invalidColumns.length, " \u4E2A\u5217\u7F3A\u5C11 field \u5B57\u6BB5\uFF0C\u5DF2\u81EA\u52A8\u8FC7\u6EE4"));
+            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' && item.field;
+              return item.type === 'group' || item.type === 'column' && getColumnIdentity(item);
             });
           }
-          _context2.prev = 8;
+          _context2.prev = 9;
           filterModel = gridApi.getFilterModel();
           if (!currentScheme) {
-            _context2.next = 21;
+            _context2.next = 22;
             break;
           }
           if (!(currentScheme.isGlobal && !canApplyToGlobal)) {
-            _context2.next = 14;
+            _context2.next = 15;
             break;
           }
           message.error('没有权限修改全局方案');
           return _context2.abrupt("return");
-        case 14:
+        case 15:
           // 如果有激活的方案，更新该方案
           createdAt = currentScheme.createdAt, updatedAt = currentScheme.updatedAt, schemeWithoutTimestamps = _objectWithoutProperties(currentScheme, _excluded);
           savedScheme = _objectSpread(_objectSpread({}, schemeWithoutTimestamps), {}, {
@@ -547,28 +510,28 @@ var ColumnSetting = function ColumnSetting(_ref) {
             filterModel: filterModel
             // createdAt 和 updatedAt 由存储适配器自动生成
           });
-          _context2.next = 18;
+          _context2.next = 19;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
-        case 18:
+        case 19:
           message.success('列配置已保存到方案');
-          _context2.next = 37;
+          _context2.next = 38;
           break;
-        case 21:
+        case 22:
           // 如果没有激活的方案，自动创建或更新默认方案
           defaultScheme = schemes.find(function (s) {
             return s.isDefault;
           });
           if (!defaultScheme) {
-            _context2.next = 33;
+            _context2.next = 34;
             break;
           }
           if (!(defaultScheme.isGlobal && !canApplyToGlobal)) {
-            _context2.next = 26;
+            _context2.next = 27;
             break;
           }
           message.error('没有权限修改全局方案');
           return _context2.abrupt("return");
-        case 26:
+        case 27:
           // 更新默认方案
           _createdAt = defaultScheme.createdAt, _updatedAt = defaultScheme.updatedAt, _schemeWithoutTimestamps = _objectWithoutProperties(defaultScheme, _excluded2);
           savedScheme = _objectSpread(_objectSpread({}, _schemeWithoutTimestamps), {}, {
@@ -576,13 +539,13 @@ var ColumnSetting = function ColumnSetting(_ref) {
             filterModel: filterModel
             // createdAt 和 updatedAt 由存储适配器自动生成
           });
-          _context2.next = 30;
+          _context2.next = 31;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
-        case 30:
+        case 31:
           message.success('列配置已保存到默认方案');
-          _context2.next = 37;
+          _context2.next = 38;
           break;
-        case 33:
+        case 34:
           // 创建新的默认方案
           savedScheme = {
             id: uuidv4(),
@@ -594,16 +557,16 @@ var ColumnSetting = function ColumnSetting(_ref) {
             isSystem: false
             // createdAt 和 updatedAt 由存储适配器自动生成
           };
-          _context2.next = 36;
+          _context2.next = 37;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
-        case 36:
-          message.success('已创建并保存到默认方案');
         case 37:
-          _context2.next = 39;
+          message.success('已创建并保存到默认方案');
+        case 38:
+          _context2.next = 40;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 39:
+        case 40:
           // 【关键修复】直接应用方案到 Grid，不通过 handleLoadScheme
           // 这样可以避免依赖 Context 状态更新的时序问题
           logger.debug('[ColumnSetting] 保存后直接应用方案到 Grid');
@@ -615,14 +578,14 @@ var ColumnSetting = function ColumnSetting(_ref) {
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context2.next = 45;
+          _context2.next = 46;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 45:
+        case 46:
           // 2. 应用列状态（列顺序、宽度、隐藏、固定等）
           logger.debug('[ColumnSetting] 应用列状态');
-          columnState = flatConfigToColumnState(savedScheme.columnConfig);
+          columnState = flatConfigToColumnState(savedScheme.columnConfig, allColDefs);
           gridApi.applyColumnState({
             state: columnState,
             applyOrder: true
@@ -636,31 +599,31 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 4. 设置为当前方案（如果不是当前方案）
           if (!(!currentScheme || savedScheme.id !== currentScheme.id)) {
-            _context2.next = 52;
+            _context2.next = 53;
             break;
           }
-          _context2.next = 52;
+          _context2.next = 53;
           return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, savedScheme.id);
-        case 52:
-          _context2.next = 54;
+        case 53:
+          _context2.next = 55;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
-        case 54:
+        case 55:
           // 5. 关闭弹窗
           onClose();
-          _context2.next = 61;
+          _context2.next = 62;
           break;
-        case 57:
-          _context2.prev = 57;
-          _context2.t0 = _context2["catch"](8);
+        case 58:
+          _context2.prev = 58;
+          _context2.t0 = _context2["catch"](9);
           console.error('保存列配置到方案失败:', _context2.t0);
           message.error('保存列配置失败');
-        case 61:
+        case 62:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[8, 57]]);
+    }, _callee2, null, [[9, 58]]);
   })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, allColDefs, onClose]);
 
   // 保存为新方案
@@ -682,9 +645,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
             break;
           }
           values = form.values;
-          columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
+          columnConfigToSave = normalizeColumnConfig(values.items || [], allColDefs);
           // 【修复】传入 allColDefs 以保留自定义属性（cellRenderer 等）
-          gridColumnDefs = flatConfigToGridState(values.items, allColDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
+          gridColumnDefs = flatConfigToGridState(columnConfigToSave, allColDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
           logger.debug('[ColumnSetting] 另存为方案 - 更新 columnDefs');
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
@@ -695,7 +658,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
           });
         case 12:
           // 【修复】然后应用列状态（宽度、隐藏、顺序等）
-          columnState = flatConfigToColumnState(values.items);
+          columnState = flatConfigToColumnState(columnConfigToSave, allColDefs);
           gridApi.applyColumnState({
             state: columnState,
             applyOrder: true // 强制应用列顺序
@@ -752,7 +715,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
   // 设置默认方案
   var handleSetDefault = useCallback( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {
-      var scheme, _iterator3, _step3, s;
+      var scheme, _iterator2, _step2, s;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -765,15 +728,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
               break;
             }
             // 将其他方案设为非默认
-            _iterator3 = _createForOfIteratorHelper(schemes);
+            _iterator2 = _createForOfIteratorHelper(schemes);
             _context4.prev = 4;
-            _iterator3.s();
+            _iterator2.s();
           case 6:
-            if ((_step3 = _iterator3.n()).done) {
+            if ((_step2 = _iterator2.n()).done) {
               _context4.next = 13;
               break;
             }
-            s = _step3.value;
+            s = _step2.value;
             if (!(s.isDefault && s.id !== schemeId)) {
               _context4.next = 11;
               break;
@@ -791,10 +754,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
           case 15:
             _context4.prev = 15;
             _context4.t0 = _context4["catch"](4);
-            _iterator3.e(_context4.t0);
+            _iterator2.e(_context4.t0);
           case 18:
             _context4.prev = 18;
-            _iterator3.f();
+            _iterator2.f();
             return _context4.finish(18);
           case 21:
             _context4.next = 23;

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

@@ -105,7 +105,9 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
     var map = new Map();
     if (queryFormItems) {
       queryFormItems.forEach(function (item) {
-        map.set(item.field, item.headerName || item.field);
+        var _item$searchTitle;
+        // 查询方案管理显示独立查询标题，保持字段标识和持久化结构不变。@author nokecy
+        map.set(item.field, (_item$searchTitle = item.searchTitle) !== null && _item$searchTitle !== void 0 ? _item$searchTitle : item.headerName || item.field);
       });
     }
     return map;

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

@@ -27,6 +27,8 @@ export interface FlatColumnItem {
     marryChildren?: boolean;
     /** 列字段名（仅列类型） */
     field?: string;
+    /** AG-Grid 列标识；业务控件列可以只有 colId，多列也可共用同一 field。@author nokecy */
+    colId?: string;
     /** 列宽 */
     width?: number;
     /** 是否隐藏 */

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

@@ -8,6 +8,20 @@ import type { FlatColumnItem, OldColumnState } from './columnGroupTypes';
  * 生成唯一 ID
  */
 export declare const generateId: () => string;
+/** 方案与 AG-Grid 使用相同的列标识规则。@author nokecy */
+export declare function getColumnIdentity(column: {
+    colId?: string;
+    field?: string;
+}): string | undefined;
+/** 递归匹配业务列；仅对缺失标识的已存方案使用唯一原始标题恢复。@author nokecy */
+export declare function findOriginalColumn(item: {
+    colId?: string;
+    field?: string;
+    originalHeaderName?: string;
+    headerName?: string;
+}, definitions?: (ColDef | ColGroupDef)[]): ColDef | undefined;
+/** 为列方案补齐业务列身份，保留用户的顺序、标题与布局设置。@author nokecy */
+export declare function normalizeColumnConfig(items: FlatColumnItem[], definitions?: (ColDef | ColGroupDef)[]): FlatColumnItem[];
 /**
  * 去掉只做查询条件的列（hideInTable），含分组内的
  * 这类列只进查询表单，不是表格列：列方案的还原、新增列检测都不能把它带进表格