@nokecy/qc-ui 1.1.10 → 1.1.12

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

@@ -211,20 +211,95 @@ var ColumnSetting = function ColumnSetting(_ref) {
     onClose();
   }, [snapshotColumnDefs, gridApi, onClose]);
 
+  /**
+   * 加载方案
+   * 应用方案到 Grid，并更新表单数据
+   */
+  var handleLoadScheme = useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(schemeId) {
+      var scheme, gridColumnDefs, columnState;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, schemeId);
+          case 3:
+            // 应用方案到 Grid
+            scheme = schemes.find(function (s) {
+              return s.id === schemeId;
+            });
+            if (!(scheme && gridApi)) {
+              _context.next = 12;
+              break;
+            }
+            // 【关键修复】先更新 columnDefs（处理分组结构）
+            gridColumnDefs = flatConfigToGridState(scheme.columnConfig, originalColumnDefs);
+            gridApi.setGridOption('columnDefs', gridColumnDefs);
+
+            // 等待 columnDefs 更新完成
+            _context.next = 9;
+            return new Promise(function (resolve) {
+              return setTimeout(resolve, 100);
+            });
+          case 9:
+            // 【修复】然后应用列状态（宽度、隐藏、顺序等）
+            columnState = flatConfigToColumnState(scheme.columnConfig);
+            gridApi.applyColumnState({
+              state: columnState,
+              applyOrder: true // 强制应用列顺序
+            });
+
+            // 应用过滤器
+            if (scheme.filterModel) {
+              gridApi.setFilterModel(scheme.filterModel);
+            }
+          case 12:
+            message.success('方案已加载');
+
+            // 等待Grid状态更新后再刷新表单
+            setTimeout(function () {
+              if (form) {
+                var newData = getColumnData();
+                form.setValues({
+                  items: newData
+                });
+              }
+            }, 100);
+
+            // 自动关闭弹窗,让用户看到Grid的变化
+            onClose();
+            _context.next = 20;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](0);
+            message.error(_context.t0.message || '加载方案失败');
+          case 20:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 17]]);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [setCurrentColumnScheme, gridKey, schemes, gridApi, originalColumnDefs, form, getColumnData, onClose]);
+
   /**
    * 保存列配置
-   * 将扁平化配置转换回 Grid State 并应用到 AG-Grid
+   * 优化逻辑：先保存配置到存储，再通过 handleLoadScheme 统一加载
    */
-  var handleSaveColumns = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var values, flatConfig, configToSave, invalidColumns, gridColumnDefs, columnState, filterModel, defaultScheme, newScheme;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  var handleSaveColumns = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var values, flatConfig, configToSave, invalidColumns, filterModel, schemeIdToLoad, defaultScheme, newScheme;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
           if (form) {
-            _context.next = 2;
+            _context2.next = 2;
             break;
           }
-          return _context.abrupt("return");
+          return _context2.abrupt("return");
         case 2:
           values = form.values;
           flatConfig = values.items || []; // 检查是否是旧版本数据，如果是则先迁移
@@ -234,7 +309,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
             message.info('检测到旧版本配置，已自动迁移到新格式');
           }
 
-          // 【修复】验证数据完整性，过滤掉无效的列配置
+          // 验证数据完整性，过滤掉无效的列配置
           invalidColumns = configToSave.filter(function (item) {
             return item.type === 'column' && item.field !== "" && !item.field;
           });
@@ -245,68 +320,45 @@ var ColumnSetting = function ColumnSetting(_ref) {
               return item.type === 'group' || item.type === 'column' && item.field;
             });
           }
-
-          // 【修复】转换为 AG-Grid 的列定义，传入原始列定义以保留自定义属性
-          gridColumnDefs = flatConfigToGridState(configToSave, originalColumnDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
-          _context.next = 11;
-          return new Promise(function (resolve) {
-            return setTimeout(resolve, 100);
-          });
-        case 11:
-          // 【修复】然后应用列状态（宽度、隐藏、顺序等）
-          columnState = flatConfigToColumnState(configToSave);
-          gridApi.applyColumnState({
-            state: columnState,
-            applyOrder: true // 强制应用列顺序
-          });
-
-          // 【关键修复】等待 Grid 状态更新完成后再保存到方案
-          // 使用 await 确保保存完成后再关闭弹窗，避免生产环境竞态条件
-          _context.next = 15;
-          return new Promise(function (resolve) {
-            return setTimeout(resolve, 50);
-          });
-        case 15:
-          _context.prev = 15;
+          _context2.prev = 8;
           filterModel = gridApi.getFilterModel();
           if (!currentScheme) {
-            _context.next = 23;
+            _context2.next = 17;
             break;
           }
-          _context.next = 20;
+          _context2.next = 13;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, currentScheme), {}, {
             columnConfig: configToSave,
             filterModel: filterModel,
             updatedAt: Date.now()
           }));
-        case 20:
+        case 13:
+          schemeIdToLoad = currentScheme.id;
           message.success('列配置已保存到方案');
-          _context.next = 38;
+          _context2.next = 30;
           break;
-        case 23:
-          // 如果没有激活的方案，自动创建默认方案
+        case 17:
+          // 如果没有激活的方案，自动创建或更新默认方案
           defaultScheme = schemes.find(function (s) {
             return s.isDefault;
           });
           if (!defaultScheme) {
-            _context.next = 32;
+            _context2.next = 25;
             break;
           }
-          _context.next = 27;
+          _context2.next = 21;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, defaultScheme), {}, {
             columnConfig: configToSave,
             filterModel: filterModel,
             updatedAt: Date.now()
           }));
-        case 27:
-          _context.next = 29;
-          return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, defaultScheme.id);
-        case 29:
+        case 21:
+          schemeIdToLoad = defaultScheme.id;
           message.success('列配置已保存到默认方案');
-          _context.next = 38;
+          _context2.next = 30;
           break;
-        case 32:
-          // 创建新的默认方案并激活
+        case 25:
+          // 创建新的默认方案
           newScheme = {
             id: uuidv4(),
             name: '默认配置',
@@ -318,55 +370,45 @@ var ColumnSetting = function ColumnSetting(_ref) {
             createdAt: Date.now(),
             updatedAt: Date.now()
           };
-          _context.next = 35;
+          _context2.next = 28;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
-        case 35:
-          _context.next = 37;
-          return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, newScheme.id);
-        case 37:
+        case 28:
+          schemeIdToLoad = newScheme.id;
           message.success('已创建并保存到默认方案');
-        case 38:
-          _context.next = 40;
-          return new Promise(function (resolve) {
-            return setTimeout(resolve, 100);
-          });
-        case 40:
-          _context.next = 46;
+        case 30:
+          _context2.next = 32;
+          return handleLoadScheme(schemeIdToLoad);
+        case 32:
+          _context2.next = 38;
           break;
-        case 42:
-          _context.prev = 42;
-          _context.t0 = _context["catch"](15);
-          console.error('保存列配置到方案失败:', _context.t0);
+        case 34:
+          _context2.prev = 34;
+          _context2.t0 = _context2["catch"](8);
+          console.error('保存列配置到方案失败:', _context2.t0);
           message.error('保存列配置失败');
-        case 46:
-          // 【修复】保存成功后清除快照
-          setSnapshotColumnDefs(null);
-
-          // 【关键修复】确保在方案保存完成并传播后才关闭弹窗
-          onClose();
-        case 48:
+        case 38:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[15, 42]]);
-  })), [form, gridApi, onSaveColumnState, onClose, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, originalColumnDefs]);
+    }, _callee2, null, [[8, 34]]);
+  })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, handleLoadScheme]);
 
   // 保存为新方案
-  var handleSaveScheme = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  var handleSaveScheme = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     var columnConfigToSave, values, gridColumnDefs, columnState, _values, filterModel, newScheme;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           if (schemeName.trim()) {
-            _context2.next = 3;
+            _context3.next = 3;
             break;
           }
           message.warning('请输入方案名称');
-          return _context2.abrupt("return");
+          return _context3.abrupt("return");
         case 3:
-          _context2.prev = 3;
+          _context3.prev = 3;
           if (!(activeTab === 'columns' && form)) {
-            _context2.next = 17;
+            _context3.next = 17;
             break;
           }
           values = form.values;
@@ -376,7 +418,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context2.next = 11;
+          _context3.next = 11;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
@@ -389,12 +431,12 @@ var ColumnSetting = function ColumnSetting(_ref) {
           });
 
           // 等待状态更新
-          _context2.next = 15;
+          _context3.next = 15;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
         case 15:
-          _context2.next = 19;
+          _context3.next = 19;
           break;
         case 17:
           // 如果在"方案管理"标签页，使用当前表单数据
@@ -414,7 +456,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
             createdAt: Date.now(),
             updatedAt: Date.now()
           };
-          _context2.next = 23;
+          _context3.next = 23;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
         case 23:
           message.success('方案保存成功');
@@ -424,91 +466,19 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 切换到方案管理标签页,显示新创建的方案
           setActiveTab('schemes');
-          _context2.next = 33;
+          _context3.next = 33;
           break;
         case 30:
-          _context2.prev = 30;
-          _context2.t0 = _context2["catch"](3);
-          message.error(_context2.t0.message || '保存方案失败');
+          _context3.prev = 30;
+          _context3.t0 = _context3["catch"](3);
+          message.error(_context3.t0.message || '保存方案失败');
         case 33:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[3, 30]]);
+    }, _callee3, null, [[3, 30]]);
   })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, originalColumnDefs]);
 
-  // 加载方案
-  var handleLoadScheme = useCallback( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(schemeId) {
-      var scheme, gridColumnDefs, columnState;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.prev = 0;
-            _context3.next = 3;
-            return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, schemeId);
-          case 3:
-            // 应用方案到 Grid
-            scheme = schemes.find(function (s) {
-              return s.id === schemeId;
-            });
-            if (!(scheme && gridApi)) {
-              _context3.next = 12;
-              break;
-            }
-            // 【关键修复】先更新 columnDefs（处理分组结构）
-            gridColumnDefs = flatConfigToGridState(scheme.columnConfig, originalColumnDefs);
-            gridApi.setGridOption('columnDefs', gridColumnDefs);
-
-            // 等待 columnDefs 更新完成
-            _context3.next = 9;
-            return new Promise(function (resolve) {
-              return setTimeout(resolve, 100);
-            });
-          case 9:
-            // 【修复】然后应用列状态（宽度、隐藏、顺序等）
-            columnState = flatConfigToColumnState(scheme.columnConfig);
-            gridApi.applyColumnState({
-              state: columnState,
-              applyOrder: true // 强制应用列顺序
-            });
-
-            // 应用过滤器
-            if (scheme.filterModel) {
-              gridApi.setFilterModel(scheme.filterModel);
-            }
-          case 12:
-            message.success('方案已加载');
-
-            // 等待Grid状态更新后再刷新表单
-            setTimeout(function () {
-              if (form) {
-                var newData = getColumnData();
-                form.setValues({
-                  items: newData
-                });
-              }
-            }, 100);
-
-            // 自动关闭弹窗,让用户看到Grid的变化
-            onClose();
-            _context3.next = 20;
-            break;
-          case 17:
-            _context3.prev = 17;
-            _context3.t0 = _context3["catch"](0);
-            message.error(_context3.t0.message || '加载方案失败');
-          case 20:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3, null, [[0, 17]]);
-    }));
-    return function (_x) {
-      return _ref4.apply(this, arguments);
-    };
-  }(), [setCurrentColumnScheme, gridKey, schemes, gridApi, originalColumnDefs, form, getColumnData, onClose]);
-
   // 设置默认方案
   var handleSetDefault = useCallback( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {

package/dist/esm/array-table/index.js

@@ -11,7 +11,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { Fragment, useEffect, useRef, useState, useMemo, useContext } from "react";
+import React, { Fragment, useEffect, useRef, useState, useMemo } from "react";
 import { AgGridReact } from "ag-grid-react";
 import { useField, observer, RecursionField } from "@formily/react";
 import { useFieldSchema } from "@formily/react";
@@ -24,11 +24,11 @@ import ArrayAddBtn from "./arrayAddBtn";
 import PreviewArrayTable from "./preview";
 import { Space } from "antd";
 import Setting from "../ag-grid-plus/setting";
-import { GridPlusContext } from "../ag-grid-plus/context/gridContext";
 import { flatConfigToColumnState, flatConfigToGridState } from "../ag-grid-plus/setting/columnGroupUtils";
 
 // 导入 AG-Grid v33 主题
 import { agGridTheme } from "../ag-grid-plus/theme";
+import { useGridSchemes } from "../ag-grid-plus";
 
 //@ts-ignore
 var ArrayTableInner = observer(function (props) {
@@ -73,11 +73,10 @@ var ArrayTableInner = observer(function (props) {
     handleRowDragMove = _useRowDrag.handleRowDragMove;
 
   // 直接使用 Context 获取方案管理状态
-  // ArrayTable 外层已经提供了完整的 GridPlusContext.Provider
-  var context = useContext(GridPlusContext);
-  var _ref = context || {},
-    currentSchemes = _ref.currentSchemes,
-    columnSchemes = _ref.columnSchemes;
+  var _useGridSchemes = useGridSchemes(),
+    columnSchemes = _useGridSchemes.columnSchemes,
+    querySchemes = _useGridSchemes.querySchemes,
+    currentSchemes = _useGridSchemes.currentSchemes;
 
   // 获取当前表格的激活方案
   var currentScheme = useMemo(function () {
@@ -91,132 +90,82 @@ var ArrayTableInner = observer(function (props) {
     });
   }, [props.gridKey, currentSchemes, columnSchemes]);
 
-  // 使用 ref 记录上次应用的方案 ID 和配置哈希，避免重复应用
-  var lastAppliedRef = useRef({
-    schemeId: null,
-    configHash: null
-  });
+  // 使用 ref 记录上次应用的方案 ID，避免重复应用
+  var lastAppliedSchemeIdRef = useRef(null);
 
   /**
-   * 【关键修复】在页面刷新或切换方案时自动恢复列方案
+   * 方案自动加载
    *
-   * 监听 currentScheme 和 gridApiState 的变化，当方案和 Grid API 都准备好时，
-   * 自动应用方案中保存的列状态（列顺序、宽度、隐藏等）
-   *
-   * 关键优化：比较 Grid 当前状态和方案配置，只在真正不一致时才应用
+   * 参考 ag-gridPlus 优化方案：
+   * 1. 使用 Promise 链确保顺序执行，避免竞态条件
+   * 2. 使用双重 RAF 确保渲染完成
+   * 3. 完整的错误处理和清理机制
    */
   useEffect(function () {
     // 检查必要条件
     if (!props.gridKey || !gridApiState || !currentScheme) return;
     if (!currentScheme.columnConfig || currentScheme.columnConfig.length === 0) return;
 
-    // 【修复】计算方案配置的哈希
-    var schemeConfigHash = JSON.stringify({
-      id: currentScheme.id,
-      columnCount: currentScheme.columnConfig.length,
-      // 使用前3列的完整配置作为哈希的一部分（包含顺序、宽度、隐藏等）
-      firstCols: currentScheme.columnConfig.slice(0, 3).map(function (col) {
-        return {
-          field: col.field,
-          width: col.width,
-          hide: col.hide,
-          pinned: col.pinned
-        };
-      })
-    });
+    // 如果是同一个方案，跳过应用（避免重复应用）
+    if (currentScheme.id === lastAppliedSchemeIdRef.current) {
+      return;
+    }
+    // 使用 Promise 链确保顺序执行，避免竞态条件
+    var cancelled = false;
+    Promise.resolve().then(function () {
+      if (cancelled || !gridApiState) return;
 
-    // 【关键修复】比较方案配置和 Grid 当前状态
-    // 检查前3列的关键属性是否一致（跳过字段名差异）
-    var currentGridState = gridApiState.getColumnState();
-    var isGridStateSameAsScheme = true;
-    if (currentGridState.length !== currentScheme.columnConfig.length) {
-      isGridStateSameAsScheme = false;
-    } else {
-      // 比较前3列的关键属性
-      for (var i = 0; i < Math.min(3, currentGridState.length); i++) {
-        var gridCol = currentGridState[i];
-        var schemeCol = currentScheme.columnConfig[i];
-        if (schemeCol.type !== 'column') continue;
+      // 1. 检查是否包含分组配置
+      var hasGroups = currentScheme.columnConfig.some(function (item) {
+        return item.type === 'group';
+      });
 
-        // 比较关键属性（field/colId, width, hide, pinned）
-        if (gridCol.colId !== schemeCol.field || Math.abs((gridCol.width || 0) - (schemeCol.width || 0)) > 5 ||
-        // 允许5px误差
-        gridCol.hide !== schemeCol.hide || gridCol.pinned !== schemeCol.pinned) {
-          isGridStateSameAsScheme = false;
-          break;
-        }
+      // 如果包含分组，先更新 columnDefs
+      if (hasGroups) {
+        var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
+        gridApiState.setGridOption('columnDefs', gridColumnDefs);
       }
-    }
-    // 【关键】跳过应用的条件:
-    // 1. Grid 当前状态与方案配置一致（说明已经应用过或刚保存）
-    // 2. 方案配置与上次应用的相同（避免重复应用）
-    if (isGridStateSameAsScheme || schemeConfigHash === lastAppliedRef.current.configHash) {
-      // 更新记录,避免后续误判
-      lastAppliedRef.current = {
-        schemeId: currentScheme.id,
-        configHash: schemeConfigHash
-      };
-      return;
-    }
 
-    // 【提取函数】应用列状态和过滤器
-    var applyColumnStateAndFilter = function applyColumnStateAndFilter() {
-      if (!currentScheme || !gridApiState) return;
+      // 2. 应用列状态（列顺序、宽度、隐藏、固定等）
 
-      // 将扁平化的列配置转换为 AG-Grid 列状态
       var columnState = flatConfigToColumnState(currentScheme.columnConfig);
-
-      // 应用列状态（包括列顺序、宽度、隐藏等）
       gridApiState.applyColumnState({
         state: columnState,
-        applyOrder: true // 强制应用列顺序
+        applyOrder: true
       });
-      // 如果方案中包含过滤器配置，也一并应用
+    }).then(function () {
+      // 等待 Grid 状态稳定（使用 requestAnimationFrame 而非固定延迟）
+      return new Promise(function (resolve) {
+        if (cancelled) {
+          resolve();
+          return;
+        }
+        requestAnimationFrame(function () {
+          // 双重 RAF 确保渲染完成
+          requestAnimationFrame(function () {
+            return resolve();
+          });
+        });
+      });
+    }).then(function () {
+      if (cancelled || !gridApiState) return;
+
+      // 3. 应用过滤器（在列状态稳定后执行）
       if (currentScheme.filterModel) {
         gridApiState.setFilterModel(currentScheme.filterModel);
       }
 
-      // 记录本次应用的配置哈希
-      lastAppliedRef.current = {
-        schemeId: currentScheme.id,
-        configHash: schemeConfigHash
-      };
-    };
-
-    // 使用 requestAnimationFrame 延迟应用
-    var rafId = requestAnimationFrame(function () {
-      try {
-        // 【关键检测】检查是否包含分组配置
-        var hasGroups = currentScheme.columnConfig.some(function (item) {
-          return item.type === 'group';
-        });
-        // 【条件更新】只有在包含分组时才更新 columnDefs
-        // 原因：array-table 的列是动态生成的，无分组时不应该覆盖动态列定义
-        if (hasGroups) {
-          var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
-          gridApiState.setGridOption('columnDefs', gridColumnDefs);
-
-          // 等待 columnDefs 更新完成后再应用列状态
-          setTimeout(function () {
-            try {
-              applyColumnStateAndFilter();
-            } catch (error) {
-              console.error('[ArrayTable] 应用列状态失败:', error);
-            }
-          }, 100);
-        } else {
-          // 无分组时，直接应用列状态即可
-
-          applyColumnStateAndFilter();
-        }
-      } catch (error) {
+      // 记录已应用的方案 ID
+      lastAppliedSchemeIdRef.current = currentScheme.id;
+    }).catch(function (error) {
+      if (!cancelled) {
         console.error('[ArrayTable] 应用方案失败:', error);
       }
     });
 
-    // 清理函数：取消待执行的 RAF
+    // 清理函数：取消进行中的操作
     return function () {
-      cancelAnimationFrame(rafId);
+      cancelled = true;
     };
   }, [props.gridKey, gridApiState, currentScheme === null || currentScheme === void 0 ? void 0 : currentScheme.id]);
 
@@ -284,8 +233,6 @@ var ArrayTableInner = observer(function (props) {
       params.api.hidePopupMenu();
       apiRef.current = params.api;
       setGridApiState(params.api);
-
-      // 恢复列状态将由 useEffect 处理（使用方案系统）
     },
     suppressColumnVirtualisation: true,
     gridOptions: {
@@ -333,8 +280,8 @@ var ArrayTableInner = observer(function (props) {
         '    <span data-ref="eSortAsc" class="ag-header-icon ag-sort-ascending-icon"></span>' + '    <span data-ref="eSortDesc" class="ag-header-icon ag-sort-descending-icon"></span>' + '    <span data-ref="eSortNone" class="ag-header-icon ag-sort-none-icon"></span>' + "  </div>" + "</div>"
       }
     },
-    getRowId: function getRowId(_ref2) {
-      var data = _ref2.data;
+    getRowId: function getRowId(_ref) {
+      var data = _ref.data;
       return data._id || data.id;
     }
     // rowDragEntireRow={true}