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

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

@@ -0,0 +1,206 @@
+"use strict";
+
+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); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AUTO_REMEMBER_DELAY = void 0;
+exports.layoutChanged = layoutChanged;
+exports.mergeColumnLayout = mergeColumnLayout;
+exports.useAutoColumnMemory = useAutoColumnMemory;
+var _react = require("react");
+var _columnGroupUtils = require("./columnGroupUtils");
+var _uuid = require("uuid");
+var _excluded = ["createdAt", "updatedAt", "filterModel"];
+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 _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 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 _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 _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 _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 _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; }
+/** 表头上拖拽列宽、列序后，等这么久没有新的拖拽再自动保存（毫秒）。 */
+var AUTO_REMEMBER_DELAY = exports.AUTO_REMEMBER_DELAY = 600;
+
+/** 自动记忆关心的 AG Grid 列状态字段。 */
+
+var normalizePinned = function normalizePinned(pinned) {
+  return pinned === 'left' || pinned === true ? 'left' : pinned === 'right' ? 'right' : 'notPinned';
+};
+
+/**
+ * 把表格当前的列宽、列序、固定、显隐并入列方案配置，其余设置（标题、对齐、分组、过滤按钮）原样保留。
+ * 列序只重排列节点的 order 值，分组节点和层级不动。
+ */
+function mergeColumnLayout(config, state) {
+  var byId = new Map(state.map(function (item, index) {
+    return [item.colId, {
+      item: item,
+      index: index
+    }];
+  }));
+  var columns = config.filter(function (item) {
+    var _getColumnIdentity;
+    return item.type === 'column' && byId.has((_getColumnIdentity = (0, _columnGroupUtils.getColumnIdentity)(item)) !== null && _getColumnIdentity !== void 0 ? _getColumnIdentity : '');
+  });
+  var orders = columns.map(function (item) {
+    return item.order;
+  }).sort(function (a, b) {
+    return a - b;
+  });
+  var ranked = _toConsumableArray(columns).sort(function (a, b) {
+    return byId.get((0, _columnGroupUtils.getColumnIdentity)(a)).index - byId.get((0, _columnGroupUtils.getColumnIdentity)(b)).index;
+  });
+  var nextOrder = new Map(ranked.map(function (item, index) {
+    return [item.id, orders[index]];
+  }));
+  return config.map(function (item) {
+    var _current$width, _current$flex;
+    if (!nextOrder.has(item.id)) return item;
+    var _ref = byId.get((0, _columnGroupUtils.getColumnIdentity)(item)),
+      current = _ref.item;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      order: nextOrder.get(item.id),
+      width: (_current$width = current.width) !== null && _current$width !== void 0 ? _current$width : item.width,
+      // 手动拖宽后 AG Grid 会撤掉 flex；没有 flex 的列保持原样
+      flex: (_current$flex = current.flex) !== null && _current$flex !== void 0 ? _current$flex : item.flex !== undefined ? 0 : undefined,
+      hide: current.hide === undefined || current.hide === null ? item.hide : current.hide === true,
+      pinned: normalizePinned(current.pinned)
+    });
+  });
+}
+var layoutKey = function layoutKey(config) {
+  return JSON.stringify(config.filter(function (item) {
+    return item.type === 'column';
+  }).map(function (item) {
+    var _item$flex, _item$pinned;
+    return [(0, _columnGroupUtils.getColumnIdentity)(item), item.order, item.width, (_item$flex = item.flex) !== null && _item$flex !== void 0 ? _item$flex : 0, !!item.hide, (_item$pinned = item.pinned) !== null && _item$pinned !== void 0 ? _item$pinned : 'notPinned'];
+  }));
+};
+
+/** 合并后的布局是否与原配置不同。 */
+function layoutChanged(before, after) {
+  return layoutKey(before) !== layoutKey(after);
+}
+var RESIZE_SOURCES = new Set(['uiColumnResized', 'autosizeColumns']);
+var MOVE_SOURCES = new Set(['uiColumnMoved', 'uiColumnDragged']);
+
+/**
+ * 列宽、列序在表头上拖拽后自动记忆（DESIGN.md §7.5），不必再进「列方案管理」保存。
+ * 全局方案不会被改写：在个人方案上叠加布局，没有个人方案时新建一个。@author nokecy
+ */
+function useAutoColumnMemory(options) {
+  var latest = (0, _react.useRef)(options);
+  latest.current = options;
+  var enabled = options.enabled,
+    gridKey = options.gridKey,
+    ready = options.ready,
+    api = options.api;
+  (0, _react.useEffect)(function () {
+    if (!enabled || !gridKey || !ready || !api) return;
+    var timer;
+    var saving = false;
+    var persist = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var _scheme$columnConfig, _current$api$getColum;
+        var current, scheme, base, merged, createdAt, updatedAt, _legacyFilter, rest, _current$setCurrentCo, created;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              current = latest.current;
+              if (!(saving || !current.api || current.api.isDestroyed() || !current.saveColumnScheme)) {
+                _context.next = 3;
+                break;
+              }
+              return _context.abrupt("return");
+            case 3:
+              scheme = current.currentScheme;
+              base = scheme !== null && scheme !== void 0 && (_scheme$columnConfig = scheme.columnConfig) !== null && _scheme$columnConfig !== void 0 && _scheme$columnConfig.length ? scheme.columnConfig : (0, _columnGroupUtils.gridStateToFlatConfig)((_current$api$getColum = current.api.getColumnDefs()) !== null && _current$api$getColum !== void 0 ? _current$api$getColum : [], current.originalColumnDefs);
+              merged = mergeColumnLayout(base, current.api.getColumnState());
+              if (!(scheme && !layoutChanged(base, merged))) {
+                _context.next = 8;
+                break;
+              }
+              return _context.abrupt("return");
+            case 8:
+              saving = true;
+              _context.prev = 9;
+              if (!(scheme && !scheme.isGlobal)) {
+                _context.next = 16;
+                break;
+              }
+              createdAt = scheme.createdAt, updatedAt = scheme.updatedAt, _legacyFilter = scheme.filterModel, rest = _objectWithoutProperties(scheme, _excluded);
+              _context.next = 14;
+              return current.saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, rest), {}, {
+                columnConfig: merged
+              }));
+            case 14:
+              _context.next = 21;
+              break;
+            case 16:
+              // 没有个人方案（或正在用全局方案）：新建个人方案承载布局，全局方案不被改写
+              created = {
+                id: (0, _uuid.v4)(),
+                name: scheme ? '个人配置' : '默认配置',
+                description: '拖拽列宽、列序时自动保存',
+                columnConfig: merged,
+                isDefault: !scheme,
+                isSystem: false
+              };
+              _context.next = 19;
+              return current.saveColumnScheme(gridKey, created);
+            case 19:
+              _context.next = 21;
+              return (_current$setCurrentCo = current.setCurrentColumnScheme) === null || _current$setCurrentCo === void 0 ? void 0 : _current$setCurrentCo.call(current, gridKey, created.id);
+            case 21:
+              _context.next = 26;
+              break;
+            case 23:
+              _context.prev = 23;
+              _context.t0 = _context["catch"](9);
+              console.warn('[AgGridPlus] 自动保存列布局失败', _context.t0);
+            case 26:
+              _context.prev = 26;
+              saving = false;
+              return _context.finish(26);
+            case 29:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, null, [[9, 23, 26, 29]]);
+      }));
+      return function persist() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+    var schedule = function schedule() {
+      var _latest$current$delay;
+      if (timer) clearTimeout(timer);
+      timer = setTimeout(persist, (_latest$current$delay = latest.current.delay) !== null && _latest$current$delay !== void 0 ? _latest$current$delay : AUTO_REMEMBER_DELAY);
+    };
+    var onResized = function onResized(event) {
+      if (event !== null && event !== void 0 && event.finished && RESIZE_SOURCES.has(event.source)) schedule();
+    };
+    var onMoved = function onMoved(event) {
+      if ((event === null || event === void 0 ? void 0 : event.finished) !== false && MOVE_SOURCES.has(event === null || event === void 0 ? void 0 : event.source)) schedule();
+    };
+    api.addEventListener('columnResized', onResized);
+    api.addEventListener('columnMoved', onMoved);
+    return function () {
+      if (timer) clearTimeout(timer);
+      if (!api.isDestroyed()) {
+        api.removeEventListener('columnResized', onResized);
+        api.removeEventListener('columnMoved', onMoved);
+      }
+    };
+  }, [enabled, gridKey, ready, api]);
+}

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

@@ -20,6 +20,8 @@ export declare function findOriginalColumn(item: {
     originalHeaderName?: string;
     headerName?: string;
 }, definitions?: (ColDef | ColGroupDef)[]): ColDef | undefined;
+/** 不允许被隐藏的业务列（列定义声明 lockVisible）的列标识。@author nokecy */
+export declare function getLockedColumnIds(definitions?: (ColDef | ColGroupDef)[]): string[];
 /** 为列方案补齐业务列身份，保留用户的顺序、标题与布局设置。@author nokecy */
 export declare function normalizeColumnConfig(items: FlatColumnItem[], definitions?: (ColDef | ColGroupDef)[]): FlatColumnItem[];
 /**

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

@@ -12,6 +12,7 @@ exports.flatConfigToColumnState = flatConfigToColumnState;
 exports.flatConfigToGridState = flatConfigToGridState;
 exports.generateId = void 0;
 exports.getColumnIdentity = getColumnIdentity;
+exports.getLockedColumnIds = getLockedColumnIds;
 exports.gridStateToFlatConfig = gridStateToFlatConfig;
 exports.isOldSchemeData = isOldSchemeData;
 exports.migrateOldScheme = migrateOldScheme;
@@ -73,6 +74,21 @@ function findOriginalColumn(item, definitions) {
   return named.length === 1 ? named[0] : undefined;
 }
 
+/** 不允许被隐藏的业务列（列定义声明 lockVisible）的列标识。@author nokecy */
+function getLockedColumnIds(definitions) {
+  var ids = [];
+  var collect = function collect(defs) {
+    return defs.forEach(function (def) {
+      if ('children' in def && def.children) collect(def.children);else if (def.lockVisible) {
+        var id = getColumnIdentity(def);
+        if (id) ids.push(id);
+      }
+    });
+  };
+  collect(definitions !== null && definitions !== void 0 ? definitions : []);
+  return ids;
+}
+
 /** 为列方案补齐业务列身份，保留用户的顺序、标题与布局设置。@author nokecy */
 function normalizeColumnConfig(items, definitions) {
   return items.map(function (item) {
@@ -82,7 +98,9 @@ function normalizeColumnConfig(items, definitions) {
       colId: original.colId,
       field: original.field,
       originalHeaderName: original.headerName || item.originalHeaderName
-    }) : item;
+    }, original.lockVisible ? {
+      hide: false
+    } : {}) : item;
   });
 }
 

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

@@ -10,6 +10,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _ColumnSetting = _interopRequireDefault(require("./ColumnSetting"));
 var _QuerySchemeManager = _interopRequireDefault(require("./QuerySchemeManager"));
+var _index = _interopRequireDefault(require("../settingItem/index"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -31,9 +32,6 @@ var Setting = function Setting(props) {
     onSaveColumnState = props.onSaveColumnState,
     _props$showQuerySchem = props.showQueryScheme,
     showQueryScheme = _props$showQuerySchem === void 0 ? true : _props$showQuerySchem;
-  var _theme$useToken = _antd.theme.useToken(),
-    token = _theme$useToken.token; // 设置入口跟随宿主主题。@author nokecy
-
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     columnSettingVisible = _useState2[0],
@@ -67,17 +65,10 @@ var Setting = function Setting(props) {
       },
       placement: "bottomRight",
       trigger: ['click'],
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        style: {
-          margin: "0 4px",
-          color: token.colorText,
-          fontSize: 16,
-          cursor: "pointer"
-        },
-        onClick: function onClick(e) {
-          return e.preventDefault();
-        },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.SettingOutlined, {})
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.default, {
+        title: "\u5217\u8BBE\u7F6E",
+        icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.SettingOutlined, {}),
+        "aria-haspopup": "menu"
       })
     }), gridApi && columnSettingVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ColumnSetting.default, {
       gridKey: gridKey,

package/dist/cjs/ag-grid-plus/settingItem/index.d.ts

@@ -1,3 +1,13 @@
 import React from 'react';
-declare const SettingItem: (props: any) => React.JSX.Element;
+export interface SettingItemProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'title'> {
+    icon?: React.ReactNode;
+    /** 悬停提示，同时作为按钮的无障碍名称 */
+    title?: React.ReactNode;
+    /** 外层触发器（如 Popover）会向子元素注入事件与 ref，这里原样落到 button 上 */
+    active?: boolean;
+}
+/**
+ * 工具栏视图图标：真 button，可键盘聚焦，带 Tooltip（DESIGN.md §5.1）。@author nokecy
+ */
+declare const SettingItem: React.ForwardRefExoticComponent<SettingItemProps & React.RefAttributes<HTMLButtonElement>>;
 export default SettingItem;

package/dist/cjs/ag-grid-plus/settingItem/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7,21 +8,42 @@ exports.default = void 0;
 var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["icon", "title", "active", "style", "onClick"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var SettingItem = function SettingItem(props) {
-  var onClick = props.onClick,
-    icon = props.icon;
+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 _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; }
+/**
+ * 工具栏视图图标：真 button，可键盘聚焦，带 Tooltip（DESIGN.md §5.1）。@author nokecy
+ */
+var SettingItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var icon = props.icon,
+    title = props.title,
+    active = props.active,
+    style = props.style,
+    onClick = props.onClick,
+    rest = _objectWithoutProperties(props, _excluded);
   var _theme$useToken = _antd.theme.useToken(),
     token = _theme$useToken.token; // 工具入口跟随宿主主题。@author nokecy
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    style: {
-      margin: "0 4px",
-      color: token.colorText,
-      fontSize: 16,
-      cursor: "pointer"
-    },
+  var button = /*#__PURE__*/(0, _jsxRuntime.jsx)("button", _objectSpread(_objectSpread({}, rest), {}, {
+    ref: ref,
+    type: "button",
+    "aria-label": typeof title === 'string' ? title : rest['aria-label'],
     onClick: onClick,
+    style: _objectSpread({
+      color: active ? token.colorPrimary : token.colorText,
+      fontSize: 16
+    }, style),
     children: icon
-  });
-};
+  }));
+  return title ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    title: title,
+    children: button
+  }) : button;
+});
+SettingItem.displayName = 'SettingItem';
 var _default = exports.default = SettingItem;

package/dist/cjs/ag-grid-plus/shared/EmptyIllustration.d.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+import type { EmptyStateBranch } from '../utils/emptyState';
+/**
+ * 空态插画：统一 1.5px 描边的内联 SVG（DESIGN.md §10），不用 emoji、不用外链图。
+ * 四支各一张，线色取自主题的弱文字色，随明暗主题与客户主题变化。
+ *
+ * @author nokecy
+ */
+export interface EmptyIllustrationProps {
+    kind?: EmptyStateBranch;
+    size?: number;
+}
+/** 描边宽度，规范固定 1.5px。 */
+export declare const EMPTY_ILLUSTRATION_STROKE_WIDTH = 1.5;
+declare const EmptyIllustration: React.FC<EmptyIllustrationProps>;
+export default EmptyIllustration;

package/dist/cjs/ag-grid-plus/shared/EmptyIllustration.js

@@ -0,0 +1,87 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.EMPTY_ILLUSTRATION_STROKE_WIDTH = void 0;
+var _antd = require("antd");
+var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 空态插画：统一 1.5px 描边的内联 SVG（DESIGN.md §10），不用 emoji、不用外链图。
+ * 四支各一张，线色取自主题的弱文字色，随明暗主题与客户主题变化。
+ *
+ * @author nokecy
+ */
+
+/** 描边宽度，规范固定 1.5px。 */
+var EMPTY_ILLUSTRATION_STROKE_WIDTH = exports.EMPTY_ILLUSTRATION_STROKE_WIDTH = 1.5;
+var SHAPES = {
+  // 空托盘：还没有数据
+  noData: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
+      d: "M8 36 L16 18 H48 L56 36"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
+      d: "M8 36 V50 a2 2 0 0 0 2 2 H54 a2 2 0 0 0 2 -2 V36 H42 a10 10 0 0 1 -20 0 H8 Z"
+    })]
+  }),
+  // 放大镜：没有符合条件的结果
+  noResult: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("circle", {
+      cx: "28",
+      cy: "28",
+      r: "14"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
+      d: "M38.5 38.5 L54 54"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
+      d: "M22 28 H34"
+    })]
+  }),
+  // 警示三角：加载失败
+  error: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
+      d: "M32 8 L58 52 H6 Z"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
+      d: "M32 24 V38"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
+      d: "M32 44 V45"
+    })]
+  }),
+  // 锁：没有查看权限
+  noPermission: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("rect", {
+      x: "12",
+      y: "28",
+      width: "40",
+      height: "26",
+      rx: "3"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
+      d: "M20 28 V20 a12 12 0 0 1 24 0 V28"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
+      d: "M32 38 V44"
+    })]
+  })
+};
+var EmptyIllustration = function EmptyIllustration(_ref) {
+  var _ref$kind = _ref.kind,
+    kind = _ref$kind === void 0 ? 'noData' : _ref$kind,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 64 : _ref$size;
+  var _theme$useToken = _antd.theme.useToken(),
+    token = _theme$useToken.token;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", {
+    "data-empty-illustration": kind,
+    width: size,
+    height: size,
+    viewBox: "0 0 64 64",
+    fill: "none",
+    stroke: token.colorTextQuaternary,
+    strokeWidth: EMPTY_ILLUSTRATION_STROKE_WIDTH,
+    strokeLinecap: "round",
+    strokeLinejoin: "round",
+    "aria-hidden": "true",
+    children: SHAPES[kind]
+  });
+};
+var _default = exports.default = EmptyIllustration;

package/dist/cjs/ag-grid-plus/shared/NoRowsOverlay.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
+var _EmptyIllustration = _interopRequireDefault(require("./EmptyIllustration"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -31,7 +32,14 @@ var NoRowsOverlay = function NoRowsOverlay(_ref) {
       gap: 8
     },
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Empty, {
-      image: _antd.Empty.PRESENTED_IMAGE_SIMPLE,
+      image: /*#__PURE__*/(0, _jsxRuntime.jsx)(_EmptyIllustration.default, {
+        kind: branch
+      }),
+      styles: {
+        image: {
+          height: 64
+        }
+      },
       description: text
     }), branch === 'error' && onRetry ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
       size: "small",

package/dist/cjs/ag-grid-plus/shared/SkeletonOverlay.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+/**
+ * 表格加载骨架：作为 AG Grid 的 loadingOverlayComponent，只盖住表体，表头保持可见（DESIGN.md §7.3 / §10）。
+ * 只在表里还没有行（首次加载、查询后清空）时出现；已有数据时刷新不再整块遮罩，见 ag-gridPlus 的加载条。
+ * 骨架里不放任何文案，加载期间不渲染空态文字。
+ *
+ * @author nokecy
+ */
+export declare const SKELETON_ROWS = 8;
+declare const SkeletonOverlay: React.FC;
+export default SkeletonOverlay;

package/dist/cjs/ag-grid-plus/shared/SkeletonOverlay.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.SKELETON_ROWS = void 0;
+var _antd = require("antd");
+var _react = _interopRequireDefault(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 表格加载骨架：作为 AG Grid 的 loadingOverlayComponent，只盖住表体，表头保持可见（DESIGN.md §7.3 / §10）。
+ * 只在表里还没有行（首次加载、查询后清空）时出现；已有数据时刷新不再整块遮罩，见 ag-gridPlus 的加载条。
+ * 骨架里不放任何文案，加载期间不渲染空态文字。
+ *
+ * @author nokecy
+ */
+var SKELETON_ROWS = exports.SKELETON_ROWS = 8;
+var SkeletonOverlay = function SkeletonOverlay() {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    role: "status",
+    "aria-busy": "true",
+    "aria-label": "\u6B63\u5728\u52A0\u8F7D",
+    "data-qc-grid-skeleton": true,
+    style: {
+      width: '100%',
+      padding: '8px 12px',
+      boxSizing: 'border-box'
+    },
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Skeleton, {
+      active: true,
+      title: false,
+      paragraph: {
+        rows: SKELETON_ROWS,
+        width: '100%'
+      }
+    })
+  });
+};
+var _default = exports.default = SkeletonOverlay;

package/dist/cjs/ag-grid-plus/shared/storage/schemeStorageAdapter.d.ts

@@ -91,7 +91,7 @@ export interface ColumnScheme {
     description?: string;
     /** 完整的列配置数据(包含分组层级结构) */
     columnConfig: FlatColumnItem[];
-    /** AG-Grid 过滤器模型数据（可选） */
+    /** @deprecated 列头筛选不再随方案保存与还原，字段仅为兼容旧数据保留 */
     filterModel?: any;
     /** 是否为默认方案 */
     isDefault: boolean;

package/dist/cjs/ag-grid-plus/theme.d.ts

@@ -2,9 +2,15 @@
  * AG-Grid v33 主题配置
  * 使用 themeQuartz API 替代 CSS 变量方式
  */
+import type { GridDensityValues } from './density';
 export declare const agGridTheme: import("ag-grid-community").Theme<import("ag-grid-community").CoreParams & import("ag-grid-community").ButtonStyleParams & import("ag-grid-community").CheckboxStyleParams & import("ag-grid-community").TabStyleParams & import("ag-grid-community").InputStyleParams & {}>;
 /**
  * 根据当前 Ant Design ConfigProvider 主题生成 AgGrid 主题色。
  * 网格、筛选弹层、输入框和强调状态均直接跟随 antd 主题。@author nokecy
  */
-export declare function useAgGridTheme(): import("ag-grid-community").Theme<import("ag-grid-community").CoreParams & import("ag-grid-community").ButtonStyleParams & import("ag-grid-community").CheckboxStyleParams & import("ag-grid-community").TabStyleParams & import("ag-grid-community").InputStyleParams & {}>;
+export declare function useAgGridTheme(options?: {
+    /** Provider 注入的密度数值；不传保持出厂外观 */
+    density?: GridDensityValues;
+    /** 页面叠加参数：在 token 与密度之后应用，只覆盖写到的项 */
+    themeParams?: Record<string, any>;
+}): import("ag-grid-community").Theme<import("ag-grid-community").CoreParams & import("ag-grid-community").ButtonStyleParams & import("ag-grid-community").CheckboxStyleParams & import("ag-grid-community").TabStyleParams & import("ag-grid-community").InputStyleParams & {}>;