@nokecy/qc-ui 1.0.91 → 1.0.94

package/dist/cjs/index.js

@@ -261,12 +261,6 @@ Object.defineProperty(exports, "defaultStorageAdapter", {
     return _agGridPlus.defaultStorageAdapter;
   }
 });
-Object.defineProperty(exports, "destroyGlobalSchemeSync", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.destroyGlobalSchemeSync;
-  }
-});
 Object.defineProperty(exports, "flattenTreeDeep", {
   enumerable: true,
   get: function get() {
@@ -279,58 +273,10 @@ Object.defineProperty(exports, "generateUniqueName", {
     return _agGridPlus.generateUniqueName;
   }
 });
-Object.defineProperty(exports, "getGlobalAdapterFactory", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.getGlobalAdapterFactory;
-  }
-});
-Object.defineProperty(exports, "getGlobalSyncManager", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.getGlobalSyncManager;
-  }
-});
-Object.defineProperty(exports, "getGlobalSyncStatus", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.getGlobalSyncStatus;
-  }
-});
-Object.defineProperty(exports, "getUnsyncedGrids", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.getUnsyncedGrids;
-  }
-});
-Object.defineProperty(exports, "hasUnsyncedData", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.hasUnsyncedData;
-  }
-});
-Object.defineProperty(exports, "initializeGlobalSchemeSync", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.initializeGlobalSchemeSync;
-  }
-});
-Object.defineProperty(exports, "isGlobalSyncInitialized", {
+Object.defineProperty(exports, "mergeRemoteStorageConfig", {
   enumerable: true,
   get: function get() {
-    return _agGridPlus.isGlobalSyncInitialized;
-  }
-});
-Object.defineProperty(exports, "setToken", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.setToken;
-  }
-});
-Object.defineProperty(exports, "syncAllSchemes", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.syncAllSchemes;
+    return _agGridPlus.mergeRemoteStorageConfig;
   }
 });
 Object.defineProperty(exports, "useColumnSchemes", {
@@ -339,30 +285,6 @@ Object.defineProperty(exports, "useColumnSchemes", {
     return _agGridPlus.useColumnSchemes;
   }
 });
-Object.defineProperty(exports, "useGlobalColumnAdapter", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.useGlobalColumnAdapter;
-  }
-});
-Object.defineProperty(exports, "useGlobalColumnSchemeManager", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.useGlobalColumnSchemeManager;
-  }
-});
-Object.defineProperty(exports, "useGlobalQueryAdapter", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.useGlobalQueryAdapter;
-  }
-});
-Object.defineProperty(exports, "useGlobalQuerySchemeManager", {
-  enumerable: true,
-  get: function get() {
-    return _agGridPlus.useGlobalQuerySchemeManager;
-  }
-});
 Object.defineProperty(exports, "useGridPlusColumnState", {
   enumerable: true,
   get: function get() {
@@ -375,6 +297,12 @@ Object.defineProperty(exports, "useRegexValidation", {
     return _RegexEditor.useRegexValidation;
   }
 });
+Object.defineProperty(exports, "useRemoteStorage", {
+  enumerable: true,
+  get: function get() {
+    return _agGridPlus.useRemoteStorage;
+  }
+});
 Object.defineProperty(exports, "useTemplateManager", {
   enumerable: true,
   get: function get() {

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;

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

@@ -19,9 +19,10 @@ import { flatConfigToGridState, isOldSchemeData, migrateOldScheme } from "../set
  * 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 [];
@@ -44,16 +45,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 flatConfigToGridState(columns);
+    // 新格式：使用 flatConfigToGridState 转换，传入原始列定义以保留自定义属性
+    return flatConfigToGridState(columns, originalColumnDefs);
   }
 
   // 旧格式：使用旧的处理逻辑
   // 检查是否需要迁移
   if (isOldSchemeData(columns)) {
-    // 先迁移到新格式，再转换
+    // 先迁移到新格式，再转换，传入原始列定义
     var migrated = migrateOldScheme(columns);
-    return flatConfigToGridState(migrated);
+    return flatConfigToGridState(migrated, originalColumnDefs);
   }
 
   // 兼容最原始的格式（groupName）

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

@@ -25,6 +25,9 @@ import { AllEnterpriseModule } from "ag-grid-enterprise";
 
 // AG-Grid v33+ 需要显式注册模块
 ModuleRegistry.registerModules([AllEnterpriseModule]);
+
+// 导入 AG-Grid v33 主题
+import { agGridTheme } from "./theme";
 import "./index.less";
 import FormRender from "./queryForm";
 import ToolBar from "./toolBar";
@@ -41,7 +44,6 @@ import { localeText } from "./locale";
 import { GridPlusContext } from "./context/gridContext";
 import { useQuerySchemes, useQueryOrderManager } from "./querySchemes";
 import { useColumnSchemes } from "./schemes";
-import { useGlobalColumnAdapter, useGlobalQueryAdapter, isGlobalSyncInitialized } from "./storage/globalSyncManager";
 import { createSafeHtmlTemplate } from "./utils/sanitize";
 import { GridPlusError, ErrorType, ErrorSeverity } from "./errors";
 import { logger } from "./utils/logger";
@@ -51,7 +53,7 @@ var getSort = function getSort(columnState) {
   return columnState ? "".concat(columnState.colId, " ").concat(columnState.sort) : "";
 };
 function AgGridPlus(props) {
-  var _columnSchemeManager$2, _querySchemeManager$c;
+  var _columnSchemeManager$2, _querySchemeManager$c, _querySchemeManager$c3;
   var style = props.style,
     loadingProps = props.loading,
     gridParams = props.params,
@@ -138,15 +140,10 @@ function AgGridPlus(props) {
     queryItemsOrder = _useState18[0],
     setQueryItemsOrder = _useState18[1];
 
-  // 尝试获取全局适配器（如果已初始化）
-  var globalQueryAdapter = isGlobalSyncInitialized() ? useGlobalQueryAdapter() : undefined;
-  var globalColumnAdapter = isGlobalSyncInitialized() ? useGlobalColumnAdapter() : undefined;
-
   // 自动创建查询方案管理器（如果未通过 props 提供）
   var autoQuerySchemeManager = enableQuerySchemes && gridKey && !propsQuerySchemeManager ? useQuerySchemes({
     gridId: gridKey,
-    // 优先使用全局适配器，否则使用 props 传入的适配器
-    storageAdapter: globalQueryAdapter || querySchemeStorageAdapter,
+    storageAdapter: querySchemeStorageAdapter,
     onSchemeChange: function onSchemeChange(scheme) {
       if (scheme) {
         setQueryItemsOrder(scheme.itemsOrder);
@@ -161,8 +158,7 @@ function AgGridPlus(props) {
   // 自动创建列配置方案管理器（如果未通过 props 提供）
   var autoColumnSchemeManager = enableColumnSchemes && gridKey && !propsColumnSchemeManager ? useColumnSchemes({
     gridId: gridKey,
-    // 优先使用全局适配器，否则使用 props 传入的适配器
-    storageAdapter: globalColumnAdapter || columnSchemeStorageAdapter,
+    storageAdapter: columnSchemeStorageAdapter,
     enableAutoSave: true,
     onSchemeChange: function onSchemeChange(scheme) {
       console.log('[AgGridPlus] onSchemeChange 被调用:', {
@@ -242,12 +238,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 等自定义属性
+  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]);
 
   // 加载列方案
   // 仅用于设置列样式,不改变列结构
@@ -258,16 +286,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
       // 原因:
@@ -279,6 +301,7 @@ function AgGridPlus(props) {
 
   // 【修复】使用 applyColumnState 来应用列的顺序、宽度、隐藏等状态
   // applyColumnState 是 AG-Grid 推荐的方式，专门用于控制列状态
+  // 【重要】使用 defaultState: false 确保只更新方案中保存的属性，保留其他原始列属性
   useEffect(function () {
     var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
     if (!apiRef.current || !currentScheme) {
@@ -287,15 +310,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 等属性
       });
     }
 
@@ -474,14 +500,6 @@ function AgGridPlus(props) {
     var cols = getTableColumns([dataForTypeInference]);
     allColDefsRef.current = cols; // 同步更新 ref
 
-    console.log('[AgGridPlus] allColDefs 重新计算:', {
-      childrenCount: React.Children.count(children),
-      hasPropsColumnDefs: !!props.columnDefs,
-      extensibleColumnsCount: Object.keys(extensibleColumns || {}).length,
-      gridKey: gridKey,
-      colsCount: cols.length,
-      usingCachedData: !!firstRowDataRef.current
-    });
     return cols;
   }, [React.Children.count(children), props.columnDefs, extensibleColumns, gridKey]);
 
@@ -744,10 +762,10 @@ function AgGridPlus(props) {
         displayedRows.push(node.data);
       });
 
-      // 获取行ID的方法，优先使用外部传入的getRowId，否则默认使用id字段
+      // 获取行ID的方法，优先使用外部传入的getRowId，否则使用默认方法（id > _id > 行索引）
       var getRowIdMethod = props.getRowId || function (params) {
-        var _params$data, _params$data2;
-        return ((_params$data = params.data) === null || _params$data === void 0 ? void 0 : _params$data.id) || ((_params$data2 = params.data) === null || _params$data2 === void 0 ? void 0 : _params$data2._id);
+        var _ref2, _params$data$id, _params$data, _params$data2, _params$node$rowIndex, _params$node;
+        return (_ref2 = (_params$data$id = (_params$data = params.data) === null || _params$data === void 0 ? void 0 : _params$data.id) !== null && _params$data$id !== void 0 ? _params$data$id : (_params$data2 = params.data) === null || _params$data2 === void 0 ? void 0 : _params$data2._id) !== null && _ref2 !== void 0 ? _ref2 : "row-".concat((_params$node$rowIndex = (_params$node = params.node) === null || _params$node === void 0 ? void 0 : _params$node.rowIndex) !== null && _params$node$rowIndex !== void 0 ? _params$node$rowIndex : 0);
       };
 
       // 只保留既被选中又在当前显示的行
@@ -892,10 +910,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;
     }
 
@@ -936,7 +956,8 @@ function AgGridPlus(props) {
     });
     var processedColumns = processColumnGroups(columnDefs);
     return processedColumns;
-  }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass]);
+  }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass, allColDefsRef.current // 添加到依赖项
+  ]);
 
   // 构建查询表单项（带 order 属性）
   var queryFormItems = useMemo(function () {
@@ -957,6 +978,18 @@ function AgGridPlus(props) {
   // 使用顺序管理器处理排序
   var _useQueryOrderManager = useQueryOrderManager(queryFormItems, (querySchemeManager === null || querySchemeManager === void 0 || (_querySchemeManager$c = querySchemeManager.currentScheme) === null || _querySchemeManager$c === void 0 ? void 0 : _querySchemeManager$c.itemsOrder) || queryItemsOrder),
     orderedFormItems = _useQueryOrderManager.orderedFormItems;
+
+  // 根据方案的隐藏字段过滤表单项
+  var visibleFormItems = useMemo(function () {
+    var _querySchemeManager$c2;
+    var hiddenFields = (querySchemeManager === null || querySchemeManager === void 0 || (_querySchemeManager$c2 = querySchemeManager.currentScheme) === null || _querySchemeManager$c2 === void 0 ? void 0 : _querySchemeManager$c2.hiddenFields) || [];
+    if (hiddenFields.length === 0) {
+      return orderedFormItems;
+    }
+    return orderedFormItems.filter(function (item) {
+      return !hiddenFields.includes(item.field);
+    });
+  }, [orderedFormItems, querySchemeManager === null || querySchemeManager === void 0 || (_querySchemeManager$c3 = querySchemeManager.currentScheme) === null || _querySchemeManager$c3 === void 0 ? void 0 : _querySchemeManager$c3.hiddenFields]);
   useEffect(function () {
     calculateSum();
   }, [calculateSum]);
@@ -977,21 +1010,25 @@ function AgGridPlus(props) {
 
   // 准备 GridPlusContext 的值
   var gridPlusContextValue = useMemo(function () {
-    var _querySchemeManager$c2;
+    var _querySchemeManager$c4;
     return {
       extensibleColumns: extensibleColumns,
       columnState: gridPlusColumnState,
+      allColDefs: allColDefsRef.current,
+      // 【修复】传入原始完整的列定义
       onSaveColumnState: onSaveColumnState,
       applyToGlobal: applyToGlobal,
       resetCurrent: resetCurrent,
       resetAll: resetAll,
       schemeManager: columnSchemeManager,
       querySchemeManager: querySchemeManager,
-      currentQueryOrder: (querySchemeManager === null || querySchemeManager === void 0 || (_querySchemeManager$c2 = querySchemeManager.currentScheme) === null || _querySchemeManager$c2 === void 0 ? void 0 : _querySchemeManager$c2.itemsOrder) || queryItemsOrder,
+      currentQueryOrder: (querySchemeManager === null || querySchemeManager === void 0 || (_querySchemeManager$c4 = querySchemeManager.currentScheme) === null || _querySchemeManager$c4 === void 0 ? void 0 : _querySchemeManager$c4.itemsOrder) || queryItemsOrder,
       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.createElement(GridPlusContext.Provider, {
     value: gridPlusContextValue
   }, /*#__PURE__*/React.createElement(Spin, {
@@ -1006,7 +1043,7 @@ function AgGridPlus(props) {
       height: "100%"
     }
   }, search == false ? null : /*#__PURE__*/React.createElement(FormRender, {
-    colDefs: flattenColumnState(orderedFormItems),
+    colDefs: flattenColumnState(visibleFormItems),
     defaultRows: queryDefaultRows,
     columnStates: columnState || [],
     defaultExpand: defaultSearchExpand,
@@ -1061,12 +1098,13 @@ function AgGridPlus(props) {
       onSaveColumnState: onColumnStateChanged
     })]
   }), /*#__PURE__*/React.createElement(AgGridReact, _extends({
-    className: "ag-theme-custom"
+    theme: agGridTheme
   }, rest, {
     localeText: localeText,
     gridOptions: {
       enableCellTextSelection: true,
-      ensureDomOrder: true
+      ensureDomOrder: true,
+      columnHoverHighlight: true
     },
     overlayNoRowsTemplate: createSafeHtmlTemplate(overlayNoRowsTemplateText || '没有找到数据，试试调整筛选条件吧！'),
     enableRangeSelection: true,
@@ -1080,8 +1118,9 @@ function AgGridPlus(props) {
     onGridReady: onGridReady,
     defaultColDef: defaultColDef,
     getRowId: props.getRowId || function (params) {
-      var _params$data3, _params$data4;
-      return ((_params$data3 = params.data) === null || _params$data3 === void 0 ? void 0 : _params$data3.id) || ((_params$data4 = params.data) === null || _params$data4 === void 0 ? void 0 : _params$data4._id);
+      var _ref3, _params$data$id2, _params$data3, _params$data4;
+      // 优先使用 id,其次 _id,最后使用 JSON 字符串作为备用
+      return (_ref3 = (_params$data$id2 = (_params$data3 = params.data) === null || _params$data3 === void 0 ? void 0 : _params$data3.id) !== null && _params$data$id2 !== void 0 ? _params$data$id2 : (_params$data4 = params.data) === null || _params$data4 === void 0 ? void 0 : _params$data4._id) !== null && _ref3 !== void 0 ? _ref3 : JSON.stringify(params.data);
     },
     onSortChanged: function onSortChanged(event) {
       sortChanged(event.api);
@@ -1094,8 +1133,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/esm/ag-grid-plus/context/gridContext.d.ts

@@ -1,6 +1,7 @@
 import React from "react";
 import type { UseColumnSchemesReturn } from "../schemes/types";
 import type { UseQuerySchemesReturn } from "../querySchemes/types";
+import type { RemoteStorageConfig } from "../schemes/storage/remoteStorageAdapter";
 export interface GridPlusContextValue {
     /**
      * 扩展列，允许运行时动态添加，用于展示用户自定义的列
@@ -10,6 +11,11 @@ export interface GridPlusContextValue {
      * 当前表格的列状态信息，包括列的显示/隐藏、顺序、宽度等
      */
     columnState: any;
+    /**
+     * 原始完整的列定义，包含所有自定义属性（cellRenderer、valueFormatter、valueEnum 等）
+     * 用于列方案应用时保留这些属性
+     */
+    allColDefs?: any[];
     /**
      * 保存当前表格的列状态到服务器（仅保存当前表格）
      * @param gridKey 表格唯一标识
@@ -52,5 +58,10 @@ export interface GridPlusContextValue {
      * 查询表单项列表（用于查询方案管理器）
      */
     queryFormItems?: any[];
+    /**
+     * 全局 RemoteStorage 配置（可选）
+     * 当提供时，所有 StorageAdapter 会自动合并这些配置
+     */
+    remoteStorageConfig?: Partial<RemoteStorageConfig>;
 }
 export declare const GridPlusContext: React.Context<GridPlusContextValue>;

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

@@ -2,11 +2,8 @@ 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";
-export type { ColumnScheme, SchemeManagerConfig, StorageAdapter, SchemeValidationResult, UseColumnSchemesReturn, SchemeSelectorProps, SchemeManagerProps } from "./schemes";
+export { useColumnSchemes, LocalStorageAdapter, defaultStorageAdapter, RemoteStorageAdapter, PriorityStorageAdapter, useRemoteStorage, mergeRemoteStorageConfig, validateScheme, validateSchemeName, validateSchemeDescription, checkDuplicateName, generateUniqueName, STORAGE_PREFIX, DEFAULT_SCHEME_NAME, MAX_SCHEMES_PER_GRID, MAX_SCHEME_NAME_LENGTH, SchemeSelector, SchemeManager } from "./schemes";
+export type { ColumnScheme, SchemeManagerConfig, StorageAdapter, SchemeValidationResult, UseColumnSchemesReturn, SchemeSelectorProps, SchemeManagerProps, LocalStorageConfig, RemoteStorageConfig, PriorityStorageConfig } from "./schemes";
 export type { GridPlusContextValue } from "./context/gridContext";
-export { initializeGlobalSchemeSync, getGlobalSyncManager, getGlobalAdapterFactory, isGlobalSyncInitialized, destroyGlobalSchemeSync, syncAllSchemes, getGlobalSyncStatus, hasUnsyncedData, getUnsyncedGrids, setToken, useGlobalColumnAdapter, useGlobalQueryAdapter, useGlobalColumnSchemeManager, useGlobalQuerySchemeManager } from "./storage";
-export type { SyncConfig, SyncManagerEvents, SyncStatus, SchemeConflict } from "./storage";

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

@@ -2,11 +2,12 @@ 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";
-// 导出全局方案同步管理功能
-export { initializeGlobalSchemeSync, getGlobalSyncManager, getGlobalAdapterFactory, isGlobalSyncInitialized, destroyGlobalSchemeSync, syncAllSchemes, getGlobalSyncStatus, hasUnsyncedData, getUnsyncedGrids, setToken, useGlobalColumnAdapter, useGlobalQueryAdapter, useGlobalColumnSchemeManager, useGlobalQuerySchemeManager } from "./storage";
+export { useColumnSchemes, LocalStorageAdapter, defaultStorageAdapter, RemoteStorageAdapter, PriorityStorageAdapter, useRemoteStorage, mergeRemoteStorageConfig, validateScheme, validateSchemeName, validateSchemeDescription, checkDuplicateName, generateUniqueName, STORAGE_PREFIX, DEFAULT_SCHEME_NAME, MAX_SCHEMES_PER_GRID, MAX_SCHEME_NAME_LENGTH, SchemeSelector, SchemeManager } from "./schemes";
+
+// 注意: 全局方案同步管理功能已废弃
+// 相关导出已移除,请使用 RemoteStorageAdapter 替代
+// 迁移指南: docs/ag-grid-plus/storage-migration-guide.md