@nokecy/qc-ui 1.0.91 → 1.0.93

package/dist/cjs/ag-grid-plus/_utils/processColumnGroups.d.ts

@@ -5,7 +5,8 @@
  * 2. 旧格式：{ groupName: string } (简单的分组名称)
  *
  * @param columns 列配置数组
+ * @param originalColumnDefs 原始列定义数组（可选），用于保留自定义属性
  * @returns AG-Grid 列定义
  */
-declare const processColumnGroups: (columns: any[]) => any;
+declare const processColumnGroups: (columns: any[], originalColumnDefs?: any[]) => any;
 export default processColumnGroups;

package/dist/cjs/ag-grid-plus/_utils/processColumnGroups.js

@@ -24,9 +24,10 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * 2. 旧格式：{ groupName: string } (简单的分组名称)
  *
  * @param columns 列配置数组
+ * @param originalColumnDefs 原始列定义数组（可选），用于保留自定义属性
  * @returns AG-Grid 列定义
  */
-var processColumnGroups = function processColumnGroups(columns) {
+var processColumnGroups = function processColumnGroups(columns, originalColumnDefs) {
   // 如果是空数组，直接返回
   if (!columns || columns.length === 0) {
     return [];
@@ -49,16 +50,16 @@ var processColumnGroups = function processColumnGroups(columns) {
     return col.id !== undefined && col.level !== undefined && col.order !== undefined && (col.type === 'group' || col.type === 'column');
   });
   if (isNewFormat) {
-    // 新格式：使用 flatConfigToGridState 转换
-    return (0, _columnGroupUtils.flatConfigToGridState)(columns);
+    // 新格式：使用 flatConfigToGridState 转换，传入原始列定义以保留自定义属性
+    return (0, _columnGroupUtils.flatConfigToGridState)(columns, originalColumnDefs);
   }
 
   // 旧格式：使用旧的处理逻辑
   // 检查是否需要迁移
   if ((0, _columnGroupUtils.isOldSchemeData)(columns)) {
-    // 先迁移到新格式，再转换
+    // 先迁移到新格式，再转换，传入原始列定义
     var migrated = (0, _columnGroupUtils.migrateOldScheme)(columns);
-    return (0, _columnGroupUtils.flatConfigToGridState)(migrated);
+    return (0, _columnGroupUtils.flatConfigToGridState)(migrated, originalColumnDefs);
   }
 
   // 兼容最原始的格式（groupName）

package/dist/cjs/ag-grid-plus/ag-gridPlus.js

@@ -12,6 +12,7 @@ var _agGridReact = require("ag-grid-react");
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _agGridEnterprise = require("ag-grid-enterprise");
+var _theme = require("./theme");
 require("./index.less");
 var _queryForm = _interopRequireDefault(require("./queryForm"));
 var _toolBar = _interopRequireDefault(require("./toolBar"));
@@ -53,6 +54,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 // AG-Grid v33+ 需要显式注册模块
 _agGridCommunity.ModuleRegistry.registerModules([_agGridEnterprise.AllEnterpriseModule]);
+
+// 导入 AG-Grid v33 主题
+
 var Text = _antd.Typography.Text;
 var getSort = function getSort(columnState) {
   return columnState ? "".concat(columnState.colId, " ").concat(columnState.sort) : "";
@@ -249,12 +253,44 @@ function AgGridPlus(props) {
     // 只在首次有数据时保存
     if (!firstRowDataRef.current && rowData.length > 0) {
       firstRowDataRef.current = rowData[0];
-      console.log('[AgGridPlus] 保存首行数据用于类型推断:', firstRowDataRef.current);
     }
   }, [rowData]);
 
-  // 测试列数据
-  // const restData = [{"id":"47","field":"code","headerName":"编码","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"code","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"48","field":"name","headerName":"名称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"name","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"49","field":"abbName","headerName":"简称","width":110,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"abbName","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"50","field":"address","headerName":"地址","width":662,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"address","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":1},{"id":"51","field":"creator","headerName":"创建人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creator","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"52","field":"creationTime","headerName":"创建时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"creationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"53","field":"lastModifier","headerName":"最后修改人","width":90,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModifier","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"54","field":"lastModificationTime","headerName":"最后修改时间","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"lastModificationTime","pinned":null,"sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null},{"id":"55","field":"","headerName":"操作","width":160,"hide":false,"cellClass":"custom-cell-left","suppressHeaderFilterButton":true,"colId":"0","pinned":"right","sort":null,"sortIndex":null,"aggFunc":null,"rowGroup":false,"rowGroupIndex":null,"pivot":false,"pivotIndex":null,"flex":null}]
+  // 【修复】加载列方案时，合并原始列定义和方案配置
+  // 确保保留 cellRenderer、valueFormatter、valueEnum 等自定义属性
+  (0, _react.useEffect)(function () {
+    if (!gridKey || !apiRef.current) return;
+    var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
+
+    // 只有当有 columnConfig 时才应用方案
+    if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
+      var _require = require("./setting/columnGroupUtils"),
+        flatConfigToGridState = _require.flatConfigToGridState;
+
+      // 【关键】使用 flatConfigToGridState 合并原始列定义和方案配置
+      // 这样可以保留原始列定义中的 cellRenderer、valueFormatter、valueEnum 等属性
+      var mergedColumnDefs = flatConfigToGridState(currentScheme.columnConfig, allColDefsRef.current // 传入原始完整的列定义
+      );
+
+      // 应用合并后的列定义
+      apiRef.current.setGridOption("columnDefs", mergedColumnDefs);
+
+      // 设置列样式
+      var _require2 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require2.flatConfigToColumnState;
+      var _columnState = flatConfigToColumnState(currentScheme.columnConfig);
+      setColumnCellClass(handelgridPlusColumnState(_columnState));
+    }
+
+    // 应用过滤器状态
+    if (currentScheme !== null && currentScheme !== void 0 && currentScheme.filterModel) {
+      setTimeout(function () {
+        if (apiRef.current) {
+          apiRef.current.setFilterModel(currentScheme.filterModel);
+        }
+      }, 50);
+    }
+  }, [gridKey, apiRef.current, columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, allColDefsRef.current]);
 
   // 加载列方案
   // 仅用于设置列样式,不改变列结构
@@ -265,16 +301,10 @@ function AgGridPlus(props) {
 
     // 只有当有 columnConfig 时才设置列样式
     if (columnSchemeManager !== null && columnSchemeManager !== void 0 && (_columnSchemeManager$ = columnSchemeManager.currentScheme) !== null && _columnSchemeManager$ !== void 0 && _columnSchemeManager$.columnConfig) {
-      var _require = require("./setting/columnGroupUtils"),
-        flatConfigToColumnState = _require.flatConfigToColumnState;
-      var _columnState = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
-      console.log('[AgGridPlus] useEffect #1: 设置列样式', {
-        gridKey: gridKey,
-        schemeId: columnSchemeManager.currentScheme.id,
-        schemeName: columnSchemeManager.currentScheme.name,
-        columnCount: _columnState.length
-      });
-      setColumnCellClass(handelgridPlusColumnState(_columnState));
+      var _require3 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require3.flatConfigToColumnState;
+      var _columnState2 = flatConfigToColumnState(columnSchemeManager.currentScheme.columnConfig);
+      setColumnCellClass(handelgridPlusColumnState(_columnState2));
 
       // 【重要】不再调用 applyColumnState
       // 原因:
@@ -286,6 +316,7 @@ function AgGridPlus(props) {
 
   // 【修复】使用 applyColumnState 来应用列的顺序、宽度、隐藏等状态
   // applyColumnState 是 AG-Grid 推荐的方式，专门用于控制列状态
+  // 【重要】使用 defaultState: false 确保只更新方案中保存的属性，保留其他原始列属性
   (0, _react.useEffect)(function () {
     var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
     if (!apiRef.current || !currentScheme) {
@@ -294,15 +325,18 @@ function AgGridPlus(props) {
 
     // 如果有 columnConfig，使用 applyColumnState 应用列状态
     if (currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
-      var _require2 = require("./setting/columnGroupUtils"),
-        flatConfigToColumnState = _require2.flatConfigToColumnState;
-      var _columnState2 = flatConfigToColumnState(currentScheme.columnConfig);
+      var _require4 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require4.flatConfigToColumnState;
+      var _columnState3 = flatConfigToColumnState(currentScheme.columnConfig);
 
       // 使用 applyColumnState 应用列状态
-      // applyOrder: true 表示按照 state 数组的顺序重新排列列
+      // applyOrder: true - 按照 state 数组的顺序重新排列列
+      // defaultState: undefined - 【关键】不提供默认状态，只更新方案中指定的属性，保留其他原始列属性
       apiRef.current.applyColumnState({
-        state: _columnState2,
+        state: _columnState3,
         applyOrder: true
+        // 不设置 defaultState，这样只会更新 state 中指定的属性
+        // 保留列定义中的 cellRenderer、valueFormatter、headerName 等属性
       });
     }
 
@@ -481,14 +515,6 @@ function AgGridPlus(props) {
     var cols = getTableColumns([dataForTypeInference]);
     allColDefsRef.current = cols; // 同步更新 ref
 
-    console.log('[AgGridPlus] allColDefs 重新计算:', {
-      childrenCount: _react.default.Children.count(children),
-      hasPropsColumnDefs: !!props.columnDefs,
-      extensibleColumnsCount: Object.keys(extensibleColumns || {}).length,
-      gridKey: gridKey,
-      colsCount: cols.length,
-      usingCachedData: !!firstRowDataRef.current
-    });
     return cols;
   }, [_react.default.Children.count(children), props.columnDefs, extensibleColumns, gridKey]);
 
@@ -899,10 +925,12 @@ function AgGridPlus(props) {
     var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
 
     // 【修复】优先使用方案的 columnConfig，避免被默认逻辑覆盖
+    // 【关键修复】传入 allColDefsRef.current 以保留 cellRenderer、valueEnum 等属性
     if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
-      var _require3 = require("./setting/columnGroupUtils"),
-        flatConfigToGridState = _require3.flatConfigToGridState;
-      var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
+      var _require5 = require("./setting/columnGroupUtils"),
+        flatConfigToGridState = _require5.flatConfigToGridState;
+      var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig, allColDefsRef.current // 传入原始完整的列定义
+      );
       return gridColumnDefs;
     }
 
@@ -943,7 +971,8 @@ function AgGridPlus(props) {
     });
     var processedColumns = (0, _processColumnGroups.default)(columnDefs);
     return processedColumns;
-  }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, _react.default.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass]);
+  }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, _react.default.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass, allColDefsRef.current // 添加到依赖项
+  ]);
 
   // 构建查询表单项（带 order 属性）
   var queryFormItems = (0, _react.useMemo)(function () {
@@ -988,6 +1017,8 @@ function AgGridPlus(props) {
     return {
       extensibleColumns: extensibleColumns,
       columnState: gridPlusColumnState,
+      allColDefs: allColDefsRef.current,
+      // 【修复】传入原始完整的列定义
       onSaveColumnState: onSaveColumnState,
       applyToGlobal: applyToGlobal,
       resetCurrent: resetCurrent,
@@ -998,7 +1029,9 @@ function AgGridPlus(props) {
       updateQueryOrder: setQueryItemsOrder,
       queryFormItems: queryFormItems
     };
-  }, [extensibleColumns, gridPlusColumnState, onSaveColumnState, applyToGlobal, resetCurrent, resetAll, columnSchemeManager, querySchemeManager, queryItemsOrder, queryFormItems]);
+  }, [extensibleColumns, gridPlusColumnState, allColDefsRef.current,
+  // 【修复】添加到依赖数组
+  onSaveColumnState, applyToGlobal, resetCurrent, resetAll, columnSchemeManager, querySchemeManager, queryItemsOrder, queryFormItems]);
   return /*#__PURE__*/_react.default.createElement(_gridContext.GridPlusContext.Provider, {
     value: gridPlusContextValue
   }, /*#__PURE__*/_react.default.createElement(_antd.Spin, {
@@ -1068,12 +1101,13 @@ function AgGridPlus(props) {
       onSaveColumnState: onColumnStateChanged
     })]
   }), /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, _extends({
-    className: "ag-theme-custom"
+    theme: _theme.agGridTheme
   }, rest, {
     localeText: _locale.localeText,
     gridOptions: {
       enableCellTextSelection: true,
-      ensureDomOrder: true
+      ensureDomOrder: true,
+      columnHoverHighlight: true
     },
     overlayNoRowsTemplate: (0, _sanitize.createSafeHtmlTemplate)(overlayNoRowsTemplateText || '没有找到数据，试试调整筛选条件吧！'),
     enableRangeSelection: true,
@@ -1101,8 +1135,8 @@ function AgGridPlus(props) {
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
         var _apiRef$current5;
-        var _columnState3 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
-        setColumnState(_columnState3);
+        var _columnState4 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
+        setColumnState(_columnState4);
 
         // onColumnStateChanged && onColumnStateChanged(columnState)
       }

package/dist/cjs/ag-grid-plus/context/gridContext.d.ts

@@ -10,6 +10,11 @@ export interface GridPlusContextValue {
      * 当前表格的列状态信息，包括列的显示/隐藏、顺序、宽度等
      */
     columnState: any;
+    /**
+     * 原始完整的列定义，包含所有自定义属性（cellRenderer、valueFormatter、valueEnum 等）
+     * 用于列方案应用时保留这些属性
+     */
+    allColDefs?: any[];
     /**
      * 保存当前表格的列状态到服务器（仅保存当前表格）
      * @param gridKey 表格唯一标识

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

@@ -2,7 +2,6 @@ import AgGridPlus from "./ag-gridPlus";
 import { AgGridColumn } from "./interface";
 import { GridPlusContext } from "./context/gridContext";
 import { useGridPlusColumnState } from "./hooks/useGridPlusColumnState";
-import "./ag-grid-theme-builder.css";
 export { AgGridPlus, AgGridColumn, GridPlusContext, useGridPlusColumnState };
 export { dateValueFormatter, dateTimeValueFormatter, convertFilterModel, convertSortModel, flattenTreeDeep, toTree, flatten } from "./utils";
 export { useColumnSchemes, LocalStorageAdapter, defaultStorageAdapter, validateScheme, validateSchemeName, validateSchemeDescription, checkDuplicateName, generateUniqueName, STORAGE_PREFIX, DEFAULT_SCHEME_NAME, MAX_SCHEMES_PER_GRID, MAX_SCHEME_NAME_LENGTH, SchemeSelector, SchemeManager } from "./schemes";

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

@@ -241,7 +241,6 @@ var _agGridPlus = _interopRequireDefault(require("./ag-gridPlus"));
 var _interface = require("./interface");
 var _gridContext = require("./context/gridContext");
 var _useGridPlusColumnState = require("./hooks/useGridPlusColumnState");
-require("./ag-grid-theme-builder.css");
 var _utils = require("./utils");
 var _schemes = require("./schemes");
 var _storage = require("./storage");

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

@@ -13,6 +13,7 @@ var _columnGroupUtils = require("./columnGroupUtils");
 var _ColumnConfigTable = _interopRequireDefault(require("./ColumnConfigTable"));
 var _processColumnGroups = _interopRequireDefault(require("../_utils/processColumnGroups"));
 var _draggableModal = _interopRequireDefault(require("../../draggableModal"));
+var _gridContext = require("../context/gridContext");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -84,11 +85,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
     viewMode = _useState18[0],
     setViewMode = _useState18[1];
 
-  // 保存原始列定义,用于取消时恢复
+  // 【修复】从 Context 获取原始完整的列定义
+  var gridPlusContext = (0, _react.useContext)(_gridContext.GridPlusContext);
+  var originalColumnDefs = (gridPlusContext === null || gridPlusContext === void 0 ? void 0 : gridPlusContext.allColDefs) || undefined;
+
+  // 【修复】保存快照用于取消时恢复（改名避免与Context的originalColumnDefs冲突）
   var _useState19 = (0, _react.useState)(null),
     _useState20 = _slicedToArray(_useState19, 2),
-    originalColumnDefs = _useState20[0],
-    setOriginalColumnDefs = _useState20[1];
+    snapshotColumnDefs = _useState20[0],
+    setSnapshotColumnDefs = _useState20[1];
 
   /**
    * 获取列数据 - 将 Grid 的列定义转换为扁平化配置
@@ -161,11 +166,11 @@ var ColumnSetting = function ColumnSetting(_ref) {
     }
   }, [schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme, visible, form, getColumnData]);
 
-  // 弹窗打开时保存原始列定义,用于取消时恢复
+  // 【修复】弹窗打开时保存快照,用于取消时恢复
   (0, _react.useEffect)(function () {
     if (visible) {
       var currentDefs = gridApi.getColumnDefs();
-      setOriginalColumnDefs(currentDefs);
+      setSnapshotColumnDefs(currentDefs);
     }
   }, [visible, gridApi]);
 
@@ -179,31 +184,31 @@ var ColumnSetting = function ColumnSetting(_ref) {
       items: newItems
     });
 
-    // 2. 转换为 AG-Grid 列定义
-    var gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(newItems);
+    // 2. 【修复】转换为 AG-Grid 列定义，传入原始列定义以保留自定义属性
+    var gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(newItems, originalColumnDefs);
 
     // 3. 立即应用到 Grid(实时预览,不保存到方案)
     if (type !== 'formArrayTable') {
       gridApi.setGridOption("columnDefs", gridColumnDefs);
     }
-  }, [form, gridApi, type]);
+  }, [form, gridApi, type, originalColumnDefs]);
 
   /**
    * 关闭弹窗处理 - 取消时恢复原始状态
    * 如果用户取消操作,恢复到打开弹窗前的列定义状态
    */
   var handleClose = (0, _react.useCallback)(function () {
-    // 如果有保存的原始状态,恢复它
-    if (originalColumnDefs && type !== 'formArrayTable') {
-      gridApi.setGridOption("columnDefs", originalColumnDefs);
+    // 【修复】如果有保存的快照,恢复它
+    if (snapshotColumnDefs && type !== 'formArrayTable') {
+      gridApi.setGridOption("columnDefs", snapshotColumnDefs);
     }
 
-    // 清空备份
-    setOriginalColumnDefs(null);
+    // 清空快照
+    setSnapshotColumnDefs(null);
 
     // 调用父组件的 onClose
     onClose();
-  }, [originalColumnDefs, gridApi, type, onClose]);
+  }, [snapshotColumnDefs, gridApi, type, onClose]);
 
   /**
    * 保存列配置
@@ -228,8 +233,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
             _antd.message.info('检测到旧版本配置，已自动迁移到新格式');
           }
 
-          // 转换为 AG-Grid 的列定义
-          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave); // 先应用列配置到 Grid
+          // 【修复】转换为 AG-Grid 的列定义，传入原始列定义以保留自定义属性
+          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave, originalColumnDefs); // 先应用列配置到 Grid
           if (type !== 'formArrayTable') {
             gridApi.setGridOption("columnDefs", gridColumnDefs);
           }
@@ -310,8 +315,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
             }, _callee, null, [[1, 22]]);
           })), 50);
 
-          // 保存成功后清除备份
-          setOriginalColumnDefs(null);
+          // 【修复】保存成功后清除快照
+          setSnapshotColumnDefs(null);
           _antd.message.success('列配置已保存');
           onClose();
         case 12:
@@ -319,7 +324,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
           return _context2.stop();
       }
     }, _callee2);
-  })), [form, gridApi, onSaveColumnState, type, onClose, schemeManager, gridKey]);
+  })), [form, gridApi, onSaveColumnState, type, onClose, schemeManager, gridKey, originalColumnDefs]);
 
   // 保存为新方案
   var handleSaveScheme = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
@@ -341,7 +346,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
           }
           values = form.values;
           columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
-          processedColumns = (0, _processColumnGroups.default)(values.items); // 先应用到 Grid
+          // 【修复】传入原始列定义以保留自定义属性
+          processedColumns = (0, _processColumnGroups.default)(values.items, originalColumnDefs); // 先应用到 Grid
           if (type !== 'formArrayTable') {
             gridApi.setGridOption("columnDefs", processedColumns);
           }

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

@@ -20,10 +20,14 @@ export declare function gridStateToFlatConfig(columnDefs: (ColDef | ColGroupDef)
  * 扁平化配置 → Grid State
  * 将扁平化数组重建为 AG-Grid 的树形结构
  *
+ * 【重要】如果提供了 originalColumnDefs，会合并原始列定义中的所有属性
+ * 这样可以保留 cellRenderer、valueFormatter、valueEnum 等自定义渲染属性
+ *
  * @param flatConfig 扁平化配置数组
+ * @param originalColumnDefs 原始列定义数组（可选），用于保留自定义属性
  * @returns AG-Grid 列定义数组
  */
-export declare function flatConfigToGridState(flatConfig: FlatColumnItem[]): (ColDef | ColGroupDef)[];
+export declare function flatConfigToGridState(flatConfig: FlatColumnItem[], originalColumnDefs?: (ColDef | ColGroupDef)[]): (ColDef | ColGroupDef)[];
 /**
  * 旧版本数据迁移
  * 将旧的 { groupName } 结构迁移为新的树形结构

package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.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
 });
@@ -14,6 +15,14 @@ exports.migrateOldScheme = migrateOldScheme;
 exports.reorderItems = reorderItems;
 var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 /**
  * 表头分组配置工具函数
  * 负责 Grid State 与扁平化配置之间的转换
@@ -85,10 +94,45 @@ function gridStateToFlatConfig(columnDefs) {
  * 扁平化配置 → Grid State
  * 将扁平化数组重建为 AG-Grid 的树形结构
  *
+ * 【重要】如果提供了 originalColumnDefs，会合并原始列定义中的所有属性
+ * 这样可以保留 cellRenderer、valueFormatter、valueEnum 等自定义渲染属性
+ *
  * @param flatConfig 扁平化配置数组
+ * @param originalColumnDefs 原始列定义数组（可选），用于保留自定义属性
  * @returns AG-Grid 列定义数组
  */
-function flatConfigToGridState(flatConfig) {
+function flatConfigToGridState(flatConfig, originalColumnDefs) {
+  /**
+   * 从原始列定义中查找指定字段的列定义（支持递归查找分组内的列）
+   */
+  function findOriginalColDef(field, defs) {
+    if (!defs) return undefined;
+    var _iterator = _createForOfIteratorHelper(defs),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var def = _step.value;
+        // 检查是否是分组
+        if ('children' in def && def.children) {
+          // 递归查找分组内的列
+          var found = findOriginalColDef(field, def.children);
+          if (found) return found;
+        } else {
+          // 检查是否是目标列（使用类型守卫）
+          var colDef = def;
+          if (colDef.field === field) {
+            return colDef;
+          }
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return undefined;
+  }
+
   /**
    * 递归构建树形结构
    */
@@ -111,6 +155,25 @@ function flatConfigToGridState(flatConfig) {
         };
       } else {
         // 构建列节点
+        // 查找原始列定义
+        var originalDef = item.field ? findOriginalColDef(item.field, originalColumnDefs) : undefined;
+
+        // 如果找到原始列定义，合并所有属性
+        if (originalDef) {
+          return _objectSpread(_objectSpread({}, originalDef), {}, {
+            // 保留所有原始属性（cellRenderer、valueFormatter、valueEnum 等）
+            // 只覆盖方案中保存的属性
+            headerName: item.headerName,
+            width: item.width,
+            hide: item.hide,
+            pinned: item.pinned === 'notPinned' ? null : item.pinned,
+            cellClass: item.cellClass,
+            flex: item.flex,
+            suppressHeaderFilterButton: item.suppressHeaderFilterButton
+          });
+        }
+
+        // 如果没有找到原始定义，使用基本属性
         return {
           field: item.field,
           headerName: item.headerName,

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

@@ -0,0 +1,5 @@
+/**
+ * AG-Grid v33 主题配置
+ * 使用 themeQuartz API 替代 CSS 变量方式
+ */
+export declare const agGridTheme: import("ag-grid-community").Theme<import("ag-grid-community").ThemeDefaultParams>;

package/dist/cjs/ag-grid-plus/theme.js

@@ -0,0 +1,78 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.agGridTheme = void 0;
+var _agGridCommunity = require("ag-grid-community");
+/**
+ * AG-Grid v33 主题配置
+ * 使用 themeQuartz API 替代 CSS 变量方式
+ */
+
+var agGridTheme = exports.agGridTheme = _agGridCommunity.themeQuartz.withParams({
+  // 基础颜色
+  backgroundColor: '#FFFFFF',
+  foregroundColor: '#555B62',
+  accentColor: '#087AD1',
+  invalidColor: '#e02525',
+  borderColor: '#F0F0F0',
+  // 浏览器配置
+  browserColorScheme: 'light',
+  // 边框配置
+  wrapperBorder: true,
+  rowBorder: true,
+  columnBorder: true,
+  // 表头配置
+  headerBackgroundColor: '#FAFAFA',
+  headerFontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif',
+  headerFontWeight: 600,
+  headerFontSize: 12,
+  headerHeight: 25,
+  headerTextColor: '#000000E1',
+  headerColumnBorder: true,
+  headerColumnBorderHeight: '100%',
+  headerVerticalPaddingScale: 0.8,
+  // 字体配置
+  fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif',
+  fontSize: 12,
+  // 单元格配置
+  cellTextColor: '#000000E1',
+  cellHorizontalPaddingScale: 0.7,
+  // 行配置
+  rowVerticalPaddingScale: 0.8,
+  rowHoverColor: 'color-mix(in srgb, transparent, #087AD1 12%)',
+  selectedRowBackgroundColor: 'color-mix(in srgb, transparent, #087AD1 8%)',
+  oddRowBackgroundColor: '#FFFFFF',
+  // 列 hover 配置
+  columnHoverColor: 'color-mix(in srgb, transparent, #087AD1 8%)',
+  // 图标尺寸
+  iconSize: 14,
+  // 边角配置
+  borderRadius: 2,
+  wrapperBorderRadius: 2,
+  // 范围选择
+  rangeSelectionBorderStyle: 'solid',
+  rangeSelectionBorderColor: '#087AD1',
+  rangeSelectionBackgroundColor: 'color-mix(in srgb, transparent, #087AD1 20%)',
+  // 弹窗阴影
+  popupShadow: '0 0 16px 0 #00000026',
+  dropdownShadow: '0 1px 4px 1px #babfc766',
+  // 拖拽配置
+  dragAndDropImageBackgroundColor: '#FFFFFF',
+  dragAndDropImageBorder: true,
+  // 焦点阴影
+  focusShadow: '0 0 0 3px color-mix(in srgb, transparent, #087AD1 50%)',
+  // 复选框配置
+  checkboxBorderWidth: 1,
+  checkboxUncheckedBackgroundColor: '#FFFFFF',
+  checkboxCheckedBackgroundColor: '#087AD1',
+  checkboxCheckedBorderColor: '#087AD1',
+  // 切换按钮配置
+  toggleButtonWidth: 28,
+  toggleButtonHeight: 18,
+  toggleButtonOnBackgroundColor: '#087AD1',
+  // 侧边栏配置
+  sideBarPanelWidth: 250,
+  spacing: 6
+});

package/dist/esm/ag-grid-plus/_utils/processColumnGroups.d.ts

@@ -5,7 +5,8 @@
  * 2. 旧格式：{ groupName: string } (简单的分组名称)
  *
  * @param columns 列配置数组
+ * @param originalColumnDefs 原始列定义数组（可选），用于保留自定义属性
  * @returns AG-Grid 列定义
  */
-declare const processColumnGroups: (columns: any[]) => any;
+declare const processColumnGroups: (columns: any[], originalColumnDefs?: any[]) => any;
 export default processColumnGroups;