@nokecy/qc-ui 1.1.38 → 1.1.40

package/dist/esm/adapters/abpPagedApiAdapter.js

@@ -0,0 +1,29 @@
+/**
+ * ABP 默认分页适配器。
+ * 请求映射为 { Filter, Sorting, SkipCount, MaxResultCount }(有 maxResultCount 时才带分页字段);
+ * 响应读取 { items, totalCount }。字节级复刻库内现有 ABP 行为。
+ * @author nokecy
+ */
+export var abpPagedApiAdapter = {
+  toRequest: function toRequest(_ref) {
+    var skipCount = _ref.skipCount,
+      maxResultCount = _ref.maxResultCount,
+      filter = _ref.filter,
+      sorter = _ref.sorter;
+    var request = {
+      Filter: filter,
+      Sorting: sorter
+    };
+    if (maxResultCount != null) {
+      request.SkipCount = skipCount !== null && skipCount !== void 0 ? skipCount : 0;
+      request.MaxResultCount = maxResultCount;
+    }
+    return request;
+  },
+  getItems: function getItems(response) {
+    return (response === null || response === void 0 ? void 0 : response.items) || [];
+  },
+  getTotal: function getTotal(response) {
+    return (response === null || response === void 0 ? void 0 : response.totalCount) || 0;
+  }
+};

package/dist/esm/adapters/index.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 分页 API 适配器模块:剥离 ABP 业务契约,支持注入非 ABP 后端形状。
+ * @author nokecy
+ */
+export type { GenericPagedQuery, PagedApiAdapter } from './pagedApiAdapter';
+export { abpPagedApiAdapter } from './abpPagedApiAdapter';

package/dist/esm/adapters/index.js

@@ -0,0 +1,6 @@
+/**
+ * 分页 API 适配器模块:剥离 ABP 业务契约,支持注入非 ABP 后端形状。
+ * @author nokecy
+ */
+
+export { abpPagedApiAdapter } from "./abpPagedApiAdapter";

package/dist/esm/adapters/pagedApiAdapter.d.ts

@@ -0,0 +1,25 @@
+/**
+ * 分页 API 适配器接口:把库内部的通用分页查询/响应,在"通用形状"与"具体后端形状"
+ * 之间转换。默认实现 abpPagedApiAdapter 保持现有 ABP 行为;非 ABP 后端可注入自定义实现。
+ * @author nokecy
+ */
+/** 通用分页查询参数(后端无关)。 */
+export interface GenericPagedQuery {
+    /** 跳过条数(偏移量)。 */
+    skipCount?: number;
+    /** 取回条数(页大小)。 */
+    maxResultCount?: number;
+    /** 过滤表达式(已序列化为字符串)。 */
+    filter?: string;
+    /** 排序表达式,如 "name asc"。 */
+    sorter?: string;
+}
+/** 分页 API 适配器。 */
+export interface PagedApiAdapter {
+    /** 通用查询 → 后端请求对象(透传给业务方的 list/request 函数)。 */
+    toRequest(query: GenericPagedQuery): Record<string, any>;
+    /** 后端响应 → 数据项数组。 */
+    getItems<T = any>(response: any): T[];
+    /** 后端响应 → 总条数。 */
+    getTotal(response: any): number;
+}

package/dist/esm/adapters/pagedApiAdapter.js

@@ -0,0 +1 @@
+export {};

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

@@ -1,8 +1,6 @@
-import _sumBy from "lodash/sumBy";
-import _uniqueId from "lodash/uniqueId";
-import _isArray from "lodash/isArray";
 var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange", "enableClickSelection", "rowSelection", "useNativeTreeFilter", "entityType"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+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); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -18,7 +16,6 @@ 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; }
-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); }
 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; }
 import { ModuleRegistry } from 'ag-grid-community';
@@ -37,21 +34,28 @@ import FormRender from "./queryForm";
 import ToolBar from "./toolBar";
 import SettingItem from "./settingItem";
 import { RedoOutlined, FilterOutlined } from '@ant-design/icons';
-import { convertFilterModel, convertRulesToFilterString, dateTimeValueFormatter, dateValueFormatter, flatten, toTree } from "./utils";
+import { convertFilterModel, dateTimeValueFormatter, dateValueFormatter, flatten, toTree } from "./utils";
 import AdvancedQueryBuilder from "./queryForm/AdvancedQueryBuilder";
 import { v4 as uuidv4 } from 'uuid';
 import Setting from "./setting";
 import { useGridPlusColumnState } from '.';
+import { useRowId } from "./hooks/useRowId";
+import _, { isArray } from 'lodash';
 import CustomGroupCellRenderer from "./_utils/customGroupCellRenderer";
 import processColumnGroups from "./_utils/processColumnGroups";
 import flattenColumnState from "./_utils/processFormColumnState";
 import { Select } from '@formily/antd-v5';
 import { localeText } from "./locale";
 import { GridPlusContext } from "./context/gridContext";
+import { QueryFormContext } from "./context/queryFormContext";
 import { useGridSchemes } from "./context/useSchemeManager";
 import { useSchemeDataFlow } from "./context/useSchemeDataFlow";
 import { extractItemsOrder, extractHiddenFields } from "./shared/utils/schemeDataMigration";
 import { createSafeHtmlTemplate } from "./utils/sanitize";
+import { computeAggregationRow } from "./utils/aggregation";
+import { sortFormItemsByOrder, filterHiddenFormItems } from "./utils/queryFormDerivation";
+import { filterVisibleSelectedRows } from "./utils/rowSelection";
+import { buildFilterString, pageToSkipCount } from "./utils/requestParams";
 import { GridPlusError, ErrorType, ErrorSeverity } from "./errors";
 import { logger } from "./utils/logger";
 import { getEntityExtensionColumns } from "./utils/entityExtensionColumns";
@@ -60,6 +64,16 @@ var Text = Typography.Text;
 var getSort = function getSort(columnState) {
   return columnState ? "".concat(columnState.colId, " ").concat(columnState.sort) : "";
 };
+
+// 深比较稳定引用:内容不变时返回同一引用。替代 JSON.stringify 作 memo 依赖——
+// 避免每次渲染序列化大对象,且 isEqual 差异早退、对 Date/undefined 比较语义正确 @author nokecy
+function useDeepCompareStable(value) {
+  var ref = useRef(value);
+  if (!_.isEqual(ref.current, value)) {
+    ref.current = value;
+  }
+  return ref.current;
+}
 function AgGridPlus(props) {
   var style = props.style,
     loadingProps = props.loading,
@@ -103,72 +117,16 @@ function AgGridPlus(props) {
   var gridRef = useRef();
   var apiRef = useRef();
   var allColDefsRef = useRef([]);
+  // 请求序号:只接受最新一次请求的响应,防止快速翻页/连续查询时慢请求乱序覆盖新结果 @author nokecy
+  var requestSeqRef = useRef(0);
 
   // 【新增】缓存初始的 columnDefs，用于保留原始 headerName
   // 这个值在组件生命周期中保持不变，不会被列方案修改
   var initialColumnDefsRef = useRef([]);
 
   // 【新增】用于缓存每个数据对象的唯一 ID（降级方案）
-  var rowIdCacheRef = useRef(new WeakMap());
-  var rowIdCounterRef = useRef(0);
-
-  /**
-   * 【新增】智能生成唯一行 ID 的降级函数
-   *
-   * 策略（按优先级）：
-   * 1. 尝试常见 ID 字段：id, _id, key, uid, uuid
-   *    - 支持基本类型：string, number
-   *    - 支持对象类型：提取 value, id 属性
-   * 2. 如果对象在 WeakMap 中已有缓存，直接返回
-   * 3. 生成新的唯一 ID：grid-key-{counter}-{timestamp}
-   *
-   * @param data 行数据对象
-   * @returns 唯一的行 ID 字符串
-   */
-  var generateUniqueRowId = useCallback(function (data) {
-    if (!data || _typeof(data) !== 'object') {
-      return "row-empty-".concat(rowIdCounterRef.current++);
-    }
-
-    // 1. 尝试常见 ID 字段
-    var commonIdFields = ['id', '_id', 'key', 'uid', 'uuid'];
-    for (var _i = 0, _commonIdFields = commonIdFields; _i < _commonIdFields.length; _i++) {
-      var field = _commonIdFields[_i];
-      var value = data[field];
-      if (value !== undefined && value !== null && value !== '') {
-        // 【修复】处理对象类型的 ID
-        var fieldId = void 0;
-        if (_typeof(value) === 'object' && value !== null) {
-          // 对象类型：尝试提取常见的 ID 属性
-          if (value.value !== undefined) {
-            fieldId = String(value.value);
-          } else if (value.id !== undefined) {
-            fieldId = String(value.id);
-          } else {
-            // 无法提取，使用 JSON 序列化 + 字段名
-            fieldId = "".concat(field, "-").concat(JSON.stringify(value));
-          }
-        } else {
-          // 基本类型：直接转换
-          fieldId = String(value);
-        }
-        return fieldId;
-      }
-    }
-
-    // 2. 检查 WeakMap 缓存
-    var cachedId = rowIdCacheRef.current.get(data);
-    if (cachedId) {
-      return cachedId;
-    }
-
-    // 3. 生成新的唯一 ID
-    var uniqueId = "".concat(gridKey || 'grid', "-row-").concat(rowIdCounterRef.current++, "-").concat(Date.now());
-
-    // 缓存到 WeakMap（对象被回收时自动清理）
-    rowIdCacheRef.current.set(data, uniqueId);
-    return uniqueId;
-  }, [gridKey]);
+  var _useRowId = useRowId(gridKey),
+    generateUniqueRowId = _useRowId.generateUniqueRowId;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     ready = _useState2[0],
@@ -601,7 +559,7 @@ function AgGridPlus(props) {
     columnDefs = columnDefs.map(function (col) {
       return processColumnDefRecursively(col);
     });
-    extensibleColumns && gridKey && extensibleColumns[gridKey] && extensibleColumns[gridKey].map(function (column) {
+    extensibleColumns && gridKey && extensibleColumns[gridKey] && extensibleColumns[gridKey].forEach(function (column) {
       columnDefs.push({
         field: column.name,
         headerName: column.displayName,
@@ -663,16 +621,10 @@ function AgGridPlus(props) {
     return cols;
   }, [React.Children.count(children), props.columnDefs, extensibleColumns, gridKey, entityType, hostEntityExtensions]);
 
-  // 稳定化 gridParams 和 sortColumn 的引用
-  var stableGridParams = useMemo(function () {
-    return gridParams;
-  }, [JSON.stringify(gridParams)]);
-  var stableSortColumn = useMemo(function () {
-    return sortColumn;
-  }, [JSON.stringify(sortColumn)]);
-  var stableQueryFilter = useMemo(function () {
-    return queryFilter;
-  }, [JSON.stringify(queryFilter)]);
+  // 稳定化 gridParams 和 sortColumn 的引用(深比较,内容不变即复用旧引用)
+  var stableGridParams = useDeepCompareStable(gridParams);
+  var stableSortColumn = useDeepCompareStable(sortColumn);
+  var stableQueryFilter = useDeepCompareStable(queryFilter);
 
   // AG-Grid v33+ 行选择配置（使用对象 API）
   var rowSelectionConfig = useMemo(function () {
@@ -735,29 +687,22 @@ function AgGridPlus(props) {
       pagination: pagination
     });
     try {
-      // 处理高级查询模式
-      var filter;
-      if (queryFilter.__advancedMode__ && queryFilter.__rules__) {
-        // 高级模式：使用规则转换
-        filter = convertRulesToFilterString(queryFilter.__rules__, allColDefsRef.current);
-        logger.debug('高级模式 Filter', {
-          rules: queryFilter.__rules__,
-          filter: filter
-        });
-      } else {
-        // 简单模式：使用原有的转换逻辑
-        filter = convertFilterModel(queryFilter, allColDefsRef.current);
-      }
+      // 处理高级查询模式 / 简单模式的过滤字符串构建
+      var filter = buildFilterString(queryFilter, allColDefsRef.current);
       var params = _objectSpread(_objectSpread({
         filter: filter
       }, stableGridParams), {}, {
         current: pagination.current,
-        skipCount: pagination.current == 1 ? 0 : (pagination.current - 1) * pagination.pageSize,
+        skipCount: pageToSkipCount(pagination.current, pagination.pageSize),
         maxResultCount: pagination.pageSize,
         sorter: getSort(stableSortColumn)
       });
+      var requestSeq = ++requestSeqRef.current;
       requestRef.current(params, undefined, queryFilter).then(function (response) {
         var _apiRef$current2;
+        // 过期响应(期间已发起更新的请求),直接丢弃 @author nokecy
+        if (requestSeq !== requestSeqRef.current) return;
+
         // 验证响应数据格式
         if (!response || _typeof(response) !== 'object') {
           throw new GridPlusError('服务器返回数据格式错误', ErrorType.DATA_FORMAT_ERROR, ErrorSeverity.HIGH, {
@@ -833,6 +778,8 @@ function AgGridPlus(props) {
           });
         }
       }).catch(function (error) {
+        // 过期请求的失败不再提示/改状态,避免干扰最新请求 @author nokecy
+        if (requestSeq !== requestSeqRef.current) return;
         setLoading(false);
 
         // 包装错误为 GridPlusError
@@ -913,7 +860,7 @@ function AgGridPlus(props) {
   }, [ready, formInitialized, stableQueryFilter, stableGridParams, pagination.current, pagination.pageSize, stableSortColumn]);
   var handelgridPlusColumnState = function handelgridPlusColumnState(columnState) {
     var cellMap = {};
-    if (_isArray(columnState)) {
+    if (isArray(columnState)) {
       columnState.forEach(function (item) {
         if (item.field && (item.cellClass || item.suppressHeaderFilterButton !== undefined || item.groupName)) {
           // 使用对象存储多个字段的值
@@ -982,21 +929,12 @@ function AgGridPlus(props) {
       };
 
       // 只保留既被选中又在当前显示的行
-      var visibleSelectedRows = allSelectedRows.filter(function (selectedRow) {
-        return displayedRows.some(function (displayedRow) {
-          var selectedRowId = getRowIdMethod({
-            data: selectedRow,
-            level: 0,
-            api: apiRef.current,
-            context: null
-          });
-          var displayedRowId = getRowIdMethod({
-            data: displayedRow,
-            level: 0,
-            api: apiRef.current,
-            context: null
-          });
-          return selectedRowId && displayedRowId && selectedRowId === displayedRowId;
+      var visibleSelectedRows = filterVisibleSelectedRows(allSelectedRows, displayedRows, function (row) {
+        return getRowIdMethod({
+          data: row,
+          level: 0,
+          api: apiRef.current,
+          context: null
         });
       });
       onSelectedRowsChangeRef.current(visibleSelectedRows);
@@ -1011,82 +949,6 @@ function AgGridPlus(props) {
       setColumnCellClass(handelgridPlusColumnState(columnState));
     }
   };
-  var isValidNumber = function isValidNumber(value) {
-    return typeof value === 'number' && !isNaN(value);
-  };
-  var sumFun = function sumFun(field, displayedData) {
-    return _sumBy(displayedData, function (cur) {
-      if (cur && isValidNumber(cur[field])) {
-        return cur[field];
-      }
-      return 0;
-    });
-  };
-  var avgFun = function avgFun(field, displayedData) {
-    // 修正:分子分母口径统一为「有效数字」,避免 count 误用数组(恒真)及除零得 NaN @author nokecy
-    var validValues = displayedData.filter(function (cur) {
-      return cur && isValidNumber(cur[field]);
-    });
-    if (validValues.length === 0) return 0;
-    var sum = _sumBy(validValues, function (cur) {
-      return cur[field];
-    });
-    return sum / validValues.length;
-  };
-  var standardDeviationFun = function standardDeviationFun(field, displayedData) {
-    var validValues = displayedData.filter(function (cur) {
-      return isValidNumber(cur[field]);
-    });
-    var count = validValues.length;
-    if (count === 0) return 0;
-    var mean = sumFun(field, displayedData) / count;
-    var variance = _sumBy(displayedData, function (cur) {
-      if (cur && cur[field] !== undefined && cur[field] !== null) {
-        var diff = cur[field] - mean;
-        return diff * diff;
-      }
-      return 0;
-    }) / count;
-    return Math.sqrt(variance);
-  };
-  var handelNumber = function handelNumber(value) {
-    return (value / 1).toLocaleString(undefined, {
-      minimumFractionDigits: 2,
-      maximumFractionDigits: 2
-    });
-  };
-  // sum 求和  avg 平均值  standardDeviation 标准差
-  var calculatefun = function calculatefun(calcColFields, displayedData) {
-    var calculateArrCopy = [];
-    var calculateData = {
-      id: _uniqueId()
-    };
-    calcColFields.forEach(function (i) {
-      if (!i.cellRenderer) {
-        switch (i.calculateType) {
-          case "sum":
-            var sumPrecision = typeof i.transactionAmount === 'number' ? i.transactionAmount : 2;
-            var sumValue = Number(sumFun(i.field, displayedData).toFixed(sumPrecision));
-            calculateData[i.field] = i.formatWithCommas ? handelNumber(sumValue) : sumValue;
-            break;
-          case "avg":
-            var avgPrecision = typeof i.transactionAmount === 'number' ? i.transactionAmount : 2;
-            calculateData[i.field] = Number(avgFun(i.field, displayedData).toFixed(avgPrecision));
-            break;
-          case "standardDeviation":
-            var stdPrecision = typeof i.transactionAmount === 'number' ? i.transactionAmount : 2;
-            calculateData[i.field] = Number(standardDeviationFun(i.field, displayedData).toFixed(stdPrecision));
-            break;
-          default:
-            break;
-        }
-      }
-    });
-    if (Object.keys(calculateData).length > 0) {
-      calculateArrCopy.push(calculateData);
-    }
-    return calculateArrCopy;
-  };
   var calculateSum = useCallback(function () {
     var displayedData = [];
     if (apiRef.current) {
@@ -1111,10 +973,10 @@ function AgGridPlus(props) {
     });
     if (calcColFields.length > 0) {
       var _apiRef$current5;
-      var calculatedValues = calculatefun(calcColFields, displayedData);
+      var calculatedValues = computeAggregationRow(calcColFields, displayedData);
       (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 || _apiRef$current5.setGridOption('pinnedBottomRowData', calculatedValues);
     }
-  }, [allColDefs, calculatefun]);
+  }, [allColDefs]);
   var onFilterChanged = function onFilterChanged(event) {
     calculateSum();
   };
@@ -1172,7 +1034,9 @@ function AgGridPlus(props) {
     return processedColumns;
   }, [
   // 【关键】优先依赖派生状态
-  derivedColumnDefs, React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass, allColDefsRef.current]);
+  derivedColumnDefs, React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass,
+  // ref.current 变更不触发重渲染,作依赖无效;改依赖真正的数据源 allColDefs(memo 值) @author nokecy
+  allColDefs]);
 
   // 构建查询表单项（带 order 属性）
   var queryFormItems = useMemo(function () {
@@ -1194,36 +1058,22 @@ function AgGridPlus(props) {
   var orderedFormItems = useMemo(function () {
     // 从查询方案提取字段顺序
     var itemsOrder = currentQueryScheme ? extractItemsOrder(currentQueryScheme) : queryItemsOrder;
-    if (!itemsOrder || itemsOrder.length === 0) {
-      return queryFormItems;
-    }
-
-    // 按照 itemsOrder 排序
-    var ordered = _toConsumableArray(queryFormItems).sort(function (a, b) {
-      var indexA = itemsOrder.indexOf(a.field);
-      var indexB = itemsOrder.indexOf(b.field);
-      if (indexA === -1 && indexB === -1) return 0;
-      if (indexA === -1) return 1;
-      if (indexB === -1) return -1;
-      return indexA - indexB;
-    });
-    return ordered;
+    return sortFormItemsByOrder(queryFormItems, itemsOrder);
   }, [queryFormItems, currentQueryScheme, queryItemsOrder]);
 
   // 根据方案的隐藏字段过滤表单项
   var visibleFormItems = useMemo(function () {
     // 从查询方案提取隐藏字段
     var hiddenFields = currentQueryScheme ? extractHiddenFields(currentQueryScheme) : [];
-    if (hiddenFields.length === 0) {
-      return orderedFormItems;
-    }
-    return orderedFormItems.filter(function (item) {
-      return !hiddenFields.includes(item.field);
-    });
+    return filterHiddenFormItems(orderedFormItems, hiddenFields);
   }, [orderedFormItems, currentQueryScheme]);
+
+  // 依赖 rowData:数据刷新(翻页/查询)后需重算底部汇总行。
+  // 原内联 calculatefun 每渲染重建使本 effect 每渲染都跑而隐式覆盖此触发;
+  // 抽出后 calculateSum 变稳定,须显式依赖 rowData 以保持原行为。@author nokecy
   useEffect(function () {
     calculateSum();
-  }, [calculateSum]);
+  }, [calculateSum, rowData]);
   var rowDataMemo = useMemo(function () {
     // 【兼容】根据 useNativeTreeFilter 决定是否使用原生树形过滤
     // - useNativeTreeFilter=true: 直接传入原始数据，由 AG-Grid 原生处理树形结构（支持列头过滤所有层级）
@@ -1236,7 +1086,9 @@ function AgGridPlus(props) {
   var actionDom = toolBarRender && toolBarRender(apiRef.current, convertFilterModel(queryFilter, allColDefsRef.current), queryFilter, {
     current: pagination.current,
     skipCount: pagination.current == 1 ? 0 : (pagination.current - 1) * pagination.pageSize,
-    maxResultCount: pagination.pageSize
+    maxResultCount: pagination.pageSize,
+    page: pagination.current,
+    pageSize: pagination.pageSize
   });
   var autoGroupColumnDef = useMemo(function () {
     var _props$autoGroupColum;
@@ -1245,22 +1097,29 @@ function AgGridPlus(props) {
     });
   }, [props.autoGroupColumnDef]);
 
-  // 准备 GridPlusContext 的值（包含方案管理的完整 API）
+  // 查询表单上下文值：从 GridPlusContext 拆出，使查询表单的高频变化(顺序调整)
+  // 不再触发 GridPlusContext 全量重渲染。@author nokecy
+  var queryFormContextValue = useMemo(function () {
+    return {
+      queryFormItems: queryFormItems,
+      currentQueryOrder: currentQueryScheme ? extractItemsOrder(currentQueryScheme) : queryItemsOrder,
+      updateQueryOrder: setQueryItemsOrder
+    };
+  }, [queryFormItems, currentQueryScheme, queryItemsOrder]);
+
+  // 准备 GridPlusContext 的值（包含方案管理的完整 API；查询表单字段已移至 QueryFormContext）
   var gridPlusContextValue = useMemo(function () {
     return {
       extensibleColumns: extensibleColumns,
       columnState: gridPlusColumnState,
-      allColDefs: allColDefsRef.current,
-      // 【修复】传入原始完整的列定义
+      allColDefs: allColDefs,
+      // 直接用 memo 值(与 ref 同源,引用变化能正确触发 memo 更新) @author nokecy
       initialColumnDefs: initialColumnDefsRef.current,
-      // 【新增】传入初始列定义（用于获取原始 headerName）
+      // 初始列定义在 allColDefs 首次计算时填充,之后不变（用于获取原始 headerName）
       onSaveColumnState: onSaveColumnState,
       applyToGlobal: applyToGlobal,
       resetCurrent: resetCurrent,
       resetAll: resetAll,
-      currentQueryOrder: currentQueryScheme ? extractItemsOrder(currentQueryScheme) : queryItemsOrder,
-      updateQueryOrder: setQueryItemsOrder,
-      queryFormItems: queryFormItems,
       // ========== 方案管理 API（透传给子组件） ==========
       columnSchemes: columnSchemes,
       querySchemes: querySchemes,
@@ -1288,11 +1147,9 @@ function AgGridPlus(props) {
       // ========== 实体扩展字段配置 @author nokecy ==========
       hostEntityExtensions: hostEntityExtensions
     };
-  }, [extensibleColumns, gridPlusColumnState, allColDefsRef.current,
-  // 【修复】添加到依赖数组
-  initialColumnDefsRef.current,
-  // 【新增】添加初始列定义到依赖数组
-  onSaveColumnState, applyToGlobal, resetCurrent, resetAll, currentQueryScheme, queryItemsOrder, queryFormItems,
+  }, [extensibleColumns, gridPlusColumnState,
+  // ref.current 作依赖无效(变更不触发重渲染);依赖数据源 allColDefs,initialColumnDefs 随其首次计算填充 @author nokecy
+  allColDefs, onSaveColumnState, applyToGlobal, resetCurrent, resetAll,
   // 方案管理依赖
   columnSchemes, querySchemes, currentSchemes, schemesLoading, lastSyncTime, saveColumnScheme, deleteColumnScheme, saveQueryScheme, deleteQueryScheme, setCurrentColumnScheme, setCurrentQueryScheme, refreshSchemes, getColumnSchemes, getQuerySchemes, getCurrentScheme,
   // 全局配置依赖
@@ -1303,6 +1160,8 @@ function AgGridPlus(props) {
   hostEntityExtensions]);
   return /*#__PURE__*/React.createElement(GridPlusContext.Provider, {
     value: gridPlusContextValue
+  }, /*#__PURE__*/React.createElement(QueryFormContext.Provider, {
+    value: queryFormContextValue
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     wrapperClassName: "grid-spin"
@@ -1552,6 +1411,6 @@ function AgGridPlus(props) {
     pageSizeOptions: props.pageSizeOptions || [10, 20, 50, 100, 200, 500, 1000, 10000],
     hideOnSinglePage: false,
     showQuickJumper: false
-  }))))));
+  })))))));
 }
 export default AgGridPlus;

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

@@ -129,14 +129,17 @@ export interface GridPlusContextValue extends SchemeManagementAPI {
     resetAll: (gridKey: string) => void;
     /**
      * 查询表单项列表（用于查询方案管理器）
+     * @deprecated 已移至 QueryFormContext（useQueryForm）；保留此声明仅为向后兼容,AgGridPlus 不再经本 Context 提供。
      */
     queryFormItems?: any[];
     /**
      * 当前查询项顺序
+     * @deprecated 已移至 QueryFormContext（useQueryForm）。
      */
     currentQueryOrder?: string[];
     /**
      * 更新查询项顺序
+     * @deprecated 已移至 QueryFormContext（useQueryForm）。
      */
     updateQueryOrder?: (order: string[]) => void;
     /**

package/dist/esm/ag-grid-plus/context/queryFormContext.d.ts

@@ -0,0 +1,20 @@
+import React from 'react';
+/**
+ * 查询表单上下文。
+ *
+ * 从 GridPlusContext 中拆出"查询表单"相关字段(查询项列表/顺序/更新函数),
+ * 使查询表单的高频变化(如拖动调整顺序)不再触发 GridPlusContext 全量重渲染。
+ * 当前仅 QuerySchemeManager 消费;由 AgGridPlus 内部 Provider 提供。
+ * @author nokecy
+ */
+export interface QueryFormContextValue {
+    /** 查询表单项列表(用于查询方案管理器) */
+    queryFormItems?: any[];
+    /** 当前查询项顺序 */
+    currentQueryOrder?: string[];
+    /** 更新查询项顺序 */
+    updateQueryOrder?: (order: string[]) => void;
+}
+export declare const QueryFormContext: React.Context<QueryFormContextValue>;
+/** 读取查询表单上下文。@author nokecy */
+export declare const useQueryForm: () => QueryFormContextValue;

package/dist/esm/ag-grid-plus/context/queryFormContext.js

@@ -0,0 +1,19 @@
+import React from 'react';
+
+/**
+ * 查询表单上下文。
+ *
+ * 从 GridPlusContext 中拆出"查询表单"相关字段(查询项列表/顺序/更新函数),
+ * 使查询表单的高频变化(如拖动调整顺序)不再触发 GridPlusContext 全量重渲染。
+ * 当前仅 QuerySchemeManager 消费;由 AgGridPlus 内部 Provider 提供。
+ * @author nokecy
+ */
+
+export var QueryFormContext = /*#__PURE__*/React.createContext({
+  queryFormItems: []
+});
+
+/** 读取查询表单上下文。@author nokecy */
+export var useQueryForm = function useQueryForm() {
+  return React.useContext(QueryFormContext);
+};