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

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

@@ -0,0 +1,50 @@
+/**
+ * 悬浮行 / 选中行 / 选中且悬浮行底色（DESIGN.md §3.5）：主色朝白混合，
+ * 浅底文字（链接色）压其上必须 ≥ 4.5:1，不达标就逐步变浅。
+ * 不直接用 antd 的 colorPrimaryBg 系列：那是对主色的通用派生，绿主题下链接压其上只有 2.3~2.9。
+ * @author nokecy
+ */
+import { contrastRatio } from "../shared/contrast";
+var HEX = /^#[0-9a-f]{6}$/i;
+var toHexRgb = function toHexRgb(hex) {
+  var v = parseInt(hex.slice(1), 16);
+  return [v >> 16 & 255, v >> 8 & 255, v & 255];
+};
+
+/** 主色占 percent%，其余为白。 */
+export var mixWithWhite = function mixWithWhite(hex, percent) {
+  var rgb = toHexRgb(hex);
+  var out = rgb.map(function (c) {
+    return Math.round(255 - (255 - c) * (percent / 100));
+  });
+  return "#".concat(out.map(function (c) {
+    return c.toString(16).padStart(2, '0');
+  }).join(''));
+};
+
+/** 悬浮 6% / 选中 9% / 选中且悬浮 14%（对应规范的 94% / 91% / 86% 起混白）。 */
+var START = {
+  hover: 6,
+  selected: 9,
+  selectedHover: 14
+};
+/**
+ * @param primary 主色，非 6 位 hex 时返回 undefined，由调用方退回 antd token
+ * @param linkText 浅底文字（链接色），缺省按主色
+ */
+export function deriveRowColors(primary, linkText) {
+  if (!HEX.test(primary)) return undefined;
+  var text = linkText && HEX.test(linkText) ? linkText : primary;
+  var pick = function pick(start) {
+    for (var p = start; p > 0; p--) {
+      var bg = mixWithWhite(primary, p);
+      if (contrastRatio(text, bg) >= 4.5) return bg;
+    }
+    return '#ffffff';
+  };
+  return {
+    hover: pick(START.hover),
+    selected: pick(START.selected),
+    selectedHover: pick(START.selectedHover)
+  };
+}

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

@@ -3,12 +3,17 @@
  * 使用 AG-Grid 替代 Ant Design Table,性能更优
  */
 import React from 'react';
+import type { ICellRendererParams } from 'ag-grid-community';
 import type { FlatColumnItem } from './columnGroupTypes';
 interface ColumnConfigTableAGProps {
     items: FlatColumnItem[];
     onChange: (items: FlatColumnItem[]) => void;
     simple?: boolean;
     scrollY?: number;
+    /** 不可隐藏的业务列标识（列定义声明 lockVisible），其「隐藏」开关禁用且恒为显示 */
+    lockedColumnIds?: string[];
 }
+/** Switch 渲染器工厂 */
+export declare const createSwitchRenderer: (field: keyof FlatColumnItem) => (props: ICellRendererParams<FlatColumnItem>) => React.JSX.Element;
 declare const ColumnConfigTable: React.FC<ColumnConfigTableAGProps>;
 export default ColumnConfigTable;

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

@@ -23,7 +23,7 @@ import React, { useCallback, useMemo, useState, useRef, useEffect } from 'react'
 import { Button, Select, Switch, Space, Popconfirm, message, Tag, theme } from 'antd';
 import { DeleteOutlined, FolderOutlined, FolderAddOutlined, FileOutlined } from '@ant-design/icons';
 import { AgGridReact } from 'ag-grid-react';
-import { generateId, normalizeCellAlign } from "./columnGroupUtils";
+import { generateId, getColumnIdentity, normalizeCellAlign } from "./columnGroupUtils";
 import { DebounceNumberInput } from "./DebounceInputs";
 import { useAgGridTheme } from "../theme";
 import { ColumnNameCellRenderer } from "./ColumnNameCellRenderer";
@@ -74,8 +74,9 @@ var WidthCellRenderer = function WidthCellRenderer(props) {
 };
 
 /** Switch 渲染器工厂 */
-var createSwitchRenderer = function createSwitchRenderer(field) {
+export var createSwitchRenderer = function createSwitchRenderer(field) {
   return function (props) {
+    var _lockedIds;
     var item = props.data;
     if (!item || item.type !== 'column') return /*#__PURE__*/_jsx("span", {
       children: "-"
@@ -84,10 +85,14 @@ var createSwitchRenderer = function createSwitchRenderer(field) {
     // 获取字段值
     var fieldValue = item[field];
 
+    // 业务列不可被隐藏：开关禁用，恒为显示
+    var locked = field === 'hide' && ((_lockedIds = props.lockedIds) === null || _lockedIds === void 0 ? void 0 : _lockedIds.includes(getColumnIdentity(item)));
+
     // 只检查布尔值
-    var isChecked = fieldValue === true;
+    var isChecked = locked ? false : fieldValue === true;
     return /*#__PURE__*/_jsx(Switch, {
       checked: isChecked,
+      disabled: locked,
       onChange: function onChange(checked) {
         if (props.node) {
           // 保存时统一为布尔值
@@ -257,7 +262,8 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
     _ref2$simple = _ref2.simple,
     simple = _ref2$simple === void 0 ? false : _ref2$simple,
     _ref2$scrollY = _ref2.scrollY,
-    scrollY = _ref2$scrollY === void 0 ? 480 : _ref2$scrollY;
+    scrollY = _ref2$scrollY === void 0 ? 480 : _ref2$scrollY,
+    lockedColumnIds = _ref2.lockedColumnIds;
   var gridTheme = useAgGridTheme();
   var _theme$useToken = theme.useToken(),
     token = _theme$useToken.token; // 颜色取主题 token,跟随亮/暗主题 @author nokecy
@@ -657,6 +663,9 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
       headerName: '隐藏',
       width: 80,
       cellRenderer: createSwitchRenderer('hide'),
+      cellRendererParams: {
+        lockedIds: lockedColumnIds
+      },
       cellStyle: commonCellStyle
     }, {
       field: 'suppressHeaderFilterButton',
@@ -677,7 +686,7 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
       cellStyle: commonCellStyle
     }];
     return cols;
-  }, [handleDelete, handleAddChildGroup, simple, expandedKeys, toggleExpand, localItems]);
+  }, [handleDelete, handleAddChildGroup, simple, expandedKeys, toggleExpand, localItems, lockedColumnIds]);
 
   // 根据展开状态过滤数据
   var visibleItems = useMemo(function () {

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

@@ -1,6 +1,6 @@
 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"],
-  _excluded2 = ["createdAt", "updatedAt"],
+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; }
@@ -26,13 +26,13 @@ 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, Tag, Tooltip, Empty, theme } from 'antd';
+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, normalizeColumnConfig } from "./columnGroupUtils";
+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";
@@ -68,7 +68,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
     resetToGlobal = _useGridSchemes.resetToGlobal,
     resetAllUsers = _useGridSchemes.resetAllUsers,
     globalConfigPermissions = _useGridSchemes.globalConfigPermissions,
-    isUsingGlobalFallback = _useGridSchemes.isUsingGlobalFallback;
+    isUsingGlobalFallback = _useGridSchemes.isUsingGlobalFallback,
+    density = _useGridSchemes.density,
+    onDensityChange = _useGridSchemes.onDensityChange;
 
   // 调用方传入的列定义优先：Context 里的属于外层 AgGridPlus 或为空 @author nokecy
   var allColDefs = allColDefsProp !== null && allColDefsProp !== void 0 ? allColDefsProp : contextAllColDefs;
@@ -126,6 +128,11 @@ var ColumnSetting = function ColumnSetting(_ref) {
   // 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),
@@ -368,6 +375,18 @@ var ColumnSetting = function ColumnSetting(_ref) {
     });
   }, [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]);
+
   /**
    * 关闭弹窗处理 - 取消时恢复原始状态
    * 如果用户取消操作,恢复到打开弹窗前的列定义状态
@@ -399,7 +418,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
               return s.id === schemeId;
             });
             if (!(scheme && gridApi)) {
-              _context.next = 13;
+              _context.next = 12;
               break;
             }
             // 【关键修复】先更新 columnDefs（处理分组结构），使用 allColDefs 保留自定义属性
@@ -419,12 +438,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
               state: columnState,
               applyOrder: true // 强制应用列顺序
             });
-
-            // 应用过滤器
-            if (scheme.filterModel) {
-              gridApi.setFilterModel(scheme.filterModel);
-            }
-          case 13:
+          case 12:
             message.success('方案已加载');
 
             // 等待Grid状态更新后再刷新表单
@@ -439,17 +453,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
             // 自动关闭弹窗,让用户看到Grid的变化
             onClose();
-            _context.next = 21;
+            _context.next = 20;
             break;
-          case 18:
-            _context.prev = 18;
+          case 17:
+            _context.prev = 17;
             _context.t0 = _context["catch"](0);
             message.error(_context.t0.message || '加载方案失败');
-          case 21:
+          case 20:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 18]]);
+      }, _callee, null, [[0, 17]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
@@ -461,7 +475,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
    * 优化逻辑：先保存配置到存储，再直接应用到 Grid，不依赖 handleLoadScheme
    */
   var handleSaveColumns = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, flatConfig, configToSave, invalidColumns, filterModel, savedScheme, createdAt, updatedAt, schemeWithoutTimestamps, defaultScheme, _createdAt, _updatedAt, _schemeWithoutTimestamps, gridColumnDefs, columnState;
+    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:
@@ -492,82 +506,79 @@ var ColumnSetting = function ColumnSetting(_ref) {
             });
           }
           _context2.prev = 9;
-          filterModel = gridApi.getFilterModel();
           if (!currentScheme) {
-            _context2.next = 22;
+            _context2.next = 21;
             break;
           }
           if (!(currentScheme.isGlobal && !canApplyToGlobal)) {
-            _context2.next = 15;
+            _context2.next = 14;
             break;
           }
           message.error('没有权限修改全局方案');
           return _context2.abrupt("return");
-        case 15:
+        case 14:
           // 如果有激活的方案，更新该方案
-          createdAt = currentScheme.createdAt, updatedAt = currentScheme.updatedAt, schemeWithoutTimestamps = _objectWithoutProperties(currentScheme, _excluded);
+          // 列头筛选属于数据而非视图偏好，不随方案保存；同时丢弃旧方案里遗留的 filterModel
+          createdAt = currentScheme.createdAt, updatedAt = currentScheme.updatedAt, _legacyFilter = currentScheme.filterModel, schemeWithoutTimestamps = _objectWithoutProperties(currentScheme, _excluded);
           savedScheme = _objectSpread(_objectSpread({}, schemeWithoutTimestamps), {}, {
-            columnConfig: configToSave,
-            filterModel: filterModel
+            columnConfig: configToSave
             // createdAt 和 updatedAt 由存储适配器自动生成
           });
-          _context2.next = 19;
+          _context2.next = 18;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
-        case 19:
+        case 18:
           message.success('列配置已保存到方案');
-          _context2.next = 38;
+          _context2.next = 37;
           break;
-        case 22:
+        case 21:
           // 如果没有激活的方案，自动创建或更新默认方案
           defaultScheme = schemes.find(function (s) {
             return s.isDefault;
           });
           if (!defaultScheme) {
-            _context2.next = 34;
+            _context2.next = 33;
             break;
           }
           if (!(defaultScheme.isGlobal && !canApplyToGlobal)) {
-            _context2.next = 27;
+            _context2.next = 26;
             break;
           }
           message.error('没有权限修改全局方案');
           return _context2.abrupt("return");
-        case 27:
+        case 26:
           // 更新默认方案
-          _createdAt = defaultScheme.createdAt, _updatedAt = defaultScheme.updatedAt, _schemeWithoutTimestamps = _objectWithoutProperties(defaultScheme, _excluded2);
+          _createdAt = defaultScheme.createdAt, _updatedAt = defaultScheme.updatedAt, _legacyFilter2 = defaultScheme.filterModel, _schemeWithoutTimestamps = _objectWithoutProperties(defaultScheme, _excluded2);
           savedScheme = _objectSpread(_objectSpread({}, _schemeWithoutTimestamps), {}, {
-            columnConfig: configToSave,
-            filterModel: filterModel
+            columnConfig: configToSave
             // createdAt 和 updatedAt 由存储适配器自动生成
           });
-          _context2.next = 31;
+          _context2.next = 30;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
-        case 31:
+        case 30:
           message.success('列配置已保存到默认方案');
-          _context2.next = 38;
+          _context2.next = 37;
           break;
-        case 34:
+        case 33:
           // 创建新的默认方案
           savedScheme = {
             id: uuidv4(),
             name: '默认配置',
             description: '自动创建的默认列配置',
             columnConfig: configToSave,
-            filterModel: filterModel,
             isDefault: true,
             isSystem: false
             // createdAt 和 updatedAt 由存储适配器自动生成
           };
-          _context2.next = 37;
+          _context2.next = 36;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
-        case 37:
+        case 36:
           message.success('已创建并保存到默认方案');
-        case 38:
-          _context2.next = 40;
+        case 37:
+          _context2.next = 39;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 40:
+        case 39:
           // 【关键修复】直接应用方案到 Grid，不通过 handleLoadScheme
           // 这样可以避免依赖 Context 状态更新的时序问题
           logger.debug('[ColumnSetting] 保存后直接应用方案到 Grid');
@@ -579,11 +590,11 @@ var ColumnSetting = function ColumnSetting(_ref) {
           gridApi.setGridOption('columnDefs', sanitizeColDefs(gridColumnDefs));
 
           // 等待 columnDefs 更新完成
-          _context2.next = 46;
+          _context2.next = 45;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 46:
+        case 45:
           // 2. 应用列状态（列顺序、宽度、隐藏、固定等）
           logger.debug('[ColumnSetting] 应用列状态');
           columnState = flatConfigToColumnState(savedScheme.columnConfig, allColDefs);
@@ -592,44 +603,38 @@ var ColumnSetting = function ColumnSetting(_ref) {
             applyOrder: true
           });
 
-          // 3. 应用过滤器
-          if (savedScheme.filterModel) {
-            logger.debug('[ColumnSetting] 应用 filterModel');
-            gridApi.setFilterModel(savedScheme.filterModel);
-          }
-
           // 4. 设置为当前方案（如果不是当前方案）
           if (!(!currentScheme || savedScheme.id !== currentScheme.id)) {
-            _context2.next = 53;
+            _context2.next = 51;
             break;
           }
-          _context2.next = 53;
+          _context2.next = 51;
           return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, savedScheme.id);
-        case 53:
-          _context2.next = 55;
+        case 51:
+          _context2.next = 53;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
-        case 55:
+        case 53:
           // 5. 关闭弹窗
           onClose();
-          _context2.next = 62;
+          _context2.next = 60;
           break;
-        case 58:
-          _context2.prev = 58;
+        case 56:
+          _context2.prev = 56;
           _context2.t0 = _context2["catch"](9);
           console.error('保存列配置到方案失败:', _context2.t0);
           message.error('保存列配置失败');
-        case 62:
+        case 60:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[9, 58]]);
+    }, _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, filterModel, newScheme;
+    var columnConfigToSave, values, gridColumnDefs, columnState, _values, newScheme;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -678,21 +683,18 @@ var ColumnSetting = function ColumnSetting(_ref) {
           _values = form === null || form === void 0 ? void 0 : form.values;
           columnConfigToSave = (_values === null || _values === void 0 ? void 0 : _values.items) || [];
         case 20:
-          // 获取过滤器模型
-          filterModel = gridApi.getFilterModel();
           newScheme = {
             id: uuidv4(),
             name: schemeName.trim(),
             description: schemeDescription.trim() || "\u521B\u5EFA\u4E8E ".concat(new Date().toLocaleString()),
             columnConfig: columnConfigToSave,
-            filterModel: filterModel,
             isDefault: false,
             isSystem: false
             // createdAt 和 updatedAt 由存储适配器自动生成
           };
-          _context3.next = 24;
+          _context3.next = 23;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
-        case 24:
+        case 23:
           message.success('方案保存成功');
           setSaveSchemeVisible(false);
           setSchemeName('');
@@ -700,17 +702,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 切换到方案管理标签页,显示新创建的方案
           setActiveTab('schemes');
-          _context3.next = 34;
+          _context3.next = 33;
           break;
-        case 31:
-          _context3.prev = 31;
+        case 30:
+          _context3.prev = 30;
           _context3.t0 = _context3["catch"](3);
           message.error(_context3.t0.message || '保存方案失败');
-        case 34:
+        case 33:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[3, 31]]);
+    }, _callee3, null, [[3, 30]]);
   })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, allColDefs]);
 
   // 设置默认方案
@@ -1226,12 +1228,42 @@ var ColumnSetting = function ColumnSetting(_ref) {
         items: [{
           key: 'columns',
           label: '列配置',
-          children: /*#__PURE__*/_jsx(_Fragment, {
-            children: /*#__PURE__*/_jsx(ColumnConfigTable, {
+          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
-            })
+              simple: false,
+              lockedColumnIds: lockedColumnIds
+            })]
           })
         }, {
           key: 'schemes',

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

@@ -66,7 +66,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
   var _useQueryForm = useQueryForm(),
     queryFormItems = _useQueryForm.queryFormItems,
     currentQueryOrder = _useQueryForm.currentQueryOrder,
-    updateQueryOrder = _useQueryForm.updateQueryOrder;
+    updateQueryOrder = _useQueryForm.updateQueryOrder,
+    getQueryValues = _useQueryForm.getQueryValues;
 
   // 获取当前表格的查询方案列表
   var schemes = (querySchemes === null || querySchemes === void 0 ? void 0 : querySchemes[gridKey]) || [];
@@ -197,7 +198,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
    * 应用当前顺序和隐藏设置
    */
   var handleApplyOrder = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var editingOrder, hiddenFields, queryConfig, createdAt, updatedAt, schemeWithoutTimestamps, newScheme;
+    var _getQueryValues, editingOrder, hiddenFields, queryConfig, createdAt, updatedAt, schemeWithoutTimestamps, newScheme;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -209,8 +210,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
             return item.hidden;
           }).map(function (item) {
             return item.field;
-          }); // 构建新格式的配置
-          queryConfig = buildQueryConfig(editingOrder, hiddenFields); // 如果有当前方案,更新方案
+          }); // 构建新格式的配置：查询区当前的条件值一并存入方案，应用方案时带回
+          queryConfig = buildQueryConfig(editingOrder, hiddenFields, (_getQueryValues = getQueryValues === null || getQueryValues === void 0 ? void 0 : getQueryValues()) !== null && _getQueryValues !== void 0 ? _getQueryValues : {}); // 如果有当前方案,更新方案
           if (!currentScheme) {
             _context.next = 11;
             break;
@@ -258,13 +259,13 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
           return _context.stop();
       }
     }, _callee, null, [[0, 21]]);
-  })), [queryItemsData, currentScheme, saveQueryScheme, gridKey, updateQueryOrder, onClose, setCurrentQueryScheme]);
+  })), [queryItemsData, currentScheme, saveQueryScheme, gridKey, updateQueryOrder, onClose, setCurrentQueryScheme, getQueryValues]);
 
   /**
    * 保存为新方案
    */
   var handleSaveAsNew = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var editingOrder, hiddenFields, queryConfig, newScheme;
+    var _getQueryValues2, editingOrder, hiddenFields, queryConfig, newScheme;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -283,8 +284,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
             return item.hidden;
           }).map(function (item) {
             return item.field;
-          }); // 构建新格式的配置
-          queryConfig = buildQueryConfig(editingOrder, hiddenFields);
+          }); // 构建新格式的配置：查询区当前的条件值一并存入方案，应用方案时带回
+          queryConfig = buildQueryConfig(editingOrder, hiddenFields, (_getQueryValues2 = getQueryValues === null || getQueryValues === void 0 ? void 0 : getQueryValues()) !== null && _getQueryValues2 !== void 0 ? _getQueryValues2 : {});
           newScheme = {
             id: uuidv4(),
             name: schemeName.trim(),
@@ -310,7 +311,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
           return _context2.stop();
       }
     }, _callee2, null, [[3, 14]]);
-  })), [schemeName, queryItemsData, saveQueryScheme, gridKey]);
+  })), [schemeName, queryItemsData, saveQueryScheme, gridKey, getQueryValues]);
 
   /**
    * 开始编辑方案

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

@@ -0,0 +1,37 @@
+import type { GridApi } from 'ag-grid-community';
+import type { ColumnScheme } from '../shared/storage/schemeStorageAdapter';
+import type { FlatColumnItem } from './columnGroupTypes';
+/** 表头上拖拽列宽、列序后，等这么久没有新的拖拽再自动保存（毫秒）。 */
+export declare const AUTO_REMEMBER_DELAY = 600;
+/** 自动记忆关心的 AG Grid 列状态字段。 */
+export interface LayoutColumnState {
+    colId: string;
+    width?: number;
+    flex?: number | null;
+    hide?: boolean | null;
+    pinned?: boolean | 'left' | 'right' | null;
+}
+/**
+ * 把表格当前的列宽、列序、固定、显隐并入列方案配置，其余设置（标题、对齐、分组、过滤按钮）原样保留。
+ * 列序只重排列节点的 order 值，分组节点和层级不动。
+ */
+export declare function mergeColumnLayout(config: FlatColumnItem[], state: LayoutColumnState[]): FlatColumnItem[];
+/** 合并后的布局是否与原配置不同。 */
+export declare function layoutChanged(before: FlatColumnItem[], after: FlatColumnItem[]): boolean;
+export interface AutoColumnMemoryOptions {
+    /** 关闭后不监听表头拖拽，行为回到「必须进列方案管理保存」 */
+    enabled: boolean;
+    gridKey?: string;
+    ready: boolean;
+    api?: GridApi;
+    originalColumnDefs?: any[];
+    currentScheme?: ColumnScheme;
+    saveColumnScheme?: (gridKey: string, scheme: ColumnScheme) => Promise<void>;
+    setCurrentColumnScheme?: (gridKey: string, schemeId: string | null) => Promise<void>;
+    delay?: number;
+}
+/**
+ * 列宽、列序在表头上拖拽后自动记忆（DESIGN.md §7.5），不必再进「列方案管理」保存。
+ * 全局方案不会被改写：在个人方案上叠加布局，没有个人方案时新建一个。@author nokecy
+ */
+export declare function useAutoColumnMemory(options: AutoColumnMemoryOptions): void;