@nokecy/qc-ui 1.1.38 → 1.1.40

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

@@ -19,9 +19,18 @@ interface GridProps extends AgGridReactProps {
     headerTitle?: React.ReactNode;
     columnDefs?: (AgGridColumnPropsClone | ColGroupDef<any>)[] | null;
     toolBarRender?: (gridApi?: GridApi, filter?: string, queryFilter?: any, paginationInfo?: {
+        /** @deprecated 改用 page */
         current: number;
+        /** @deprecated 改用 page/pageSize */
         skipCount: number;
+        /** @deprecated 改用 page/pageSize */
         maxResultCount: number;
+        /** 当前页码（1-based）
+         * @author nokecy */
+        page?: number;
+        /** 每页条数
+         * @author nokecy */
+        pageSize?: number;
     }) => React.ReactNode[];
     defaultSearchExpand?: Boolean;
     /**

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _logger = require("../utils/logger");
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _agGridReact = require("ag-grid-react");
@@ -286,6 +287,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
     // 从根级别开始查找新增列
     findNewColumns(originalDefs, 0);
     if (newItems.length > 0) {
+      _logger.logger.debug('[getColumnData] 检测到新增列/分组，已追加到末尾:', newItems.map(function (i) {
+        return i.field || i.groupId;
+      }));
       return [].concat(_toConsumableArray(config), newItems);
     }
     return config;
@@ -430,19 +434,20 @@ var ColumnSetting = function ColumnSetting(_ref) {
               return s.id === schemeId;
             });
             if (!(scheme && gridApi)) {
-              _context.next = 12;
+              _context.next = 13;
               break;
             }
             // 【关键修复】先更新 columnDefs（处理分组结构），使用 allColDefs 保留自定义属性
             gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(scheme.columnConfig, allColDefs);
+            _logger.logger.debug('[ColumnSetting] 加载方案 - 更新 columnDefs');
             gridApi.setGridOption('columnDefs', gridColumnDefs);
 
             // 等待 columnDefs 更新完成
-            _context.next = 9;
+            _context.next = 10;
             return new Promise(function (resolve) {
               return setTimeout(resolve, 100);
             });
-          case 9:
+          case 10:
             // 【修复】然后应用列状态（宽度、隐藏、顺序等）
             columnState = (0, _columnGroupUtils.flatConfigToColumnState)(scheme.columnConfig);
             gridApi.applyColumnState({
@@ -454,7 +459,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
             if (scheme.filterModel) {
               gridApi.setFilterModel(scheme.filterModel);
             }
-          case 12:
+          case 13:
             _antd.message.success('方案已加载');
 
             // 等待Grid状态更新后再刷新表单
@@ -469,17 +474,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
             // 自动关闭弹窗,让用户看到Grid的变化
             onClose();
-            _context.next = 20;
+            _context.next = 21;
             break;
-          case 17:
-            _context.prev = 17;
+          case 18:
+            _context.prev = 18;
             _context.t0 = _context["catch"](0);
             _antd.message.error(_context.t0.message || '加载方案失败');
-          case 20:
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 17]]);
+      }, _callee, null, [[0, 18]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
@@ -597,15 +602,24 @@ var ColumnSetting = function ColumnSetting(_ref) {
             return setTimeout(resolve, 100);
           });
         case 39:
+          // 【关键修复】直接应用方案到 Grid，不通过 handleLoadScheme
+          // 这样可以避免依赖 Context 状态更新的时序问题
+          _logger.logger.debug('[ColumnSetting] 保存后直接应用方案到 Grid');
+
+          // 【修复】始终更新 columnDefs，确保 cellClass 等属性能即时生效
+          // 原逻辑只在有分组时才更新 columnDefs，导致对齐方式保存后无法即时生效
+          _logger.logger.debug('[ColumnSetting] 更新 columnDefs');
           gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(savedScheme.columnConfig, allColDefs);
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context2.next = 43;
+          _context2.next = 45;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 43:
+        case 45:
+          // 2. 应用列状态（列顺序、宽度、隐藏、固定等）
+          _logger.logger.debug('[ColumnSetting] 应用列状态');
           columnState = (0, _columnGroupUtils.flatConfigToColumnState)(savedScheme.columnConfig);
           gridApi.applyColumnState({
             state: columnState,
@@ -614,36 +628,37 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 3. 应用过滤器
           if (savedScheme.filterModel) {
+            _logger.logger.debug('[ColumnSetting] 应用 filterModel');
             gridApi.setFilterModel(savedScheme.filterModel);
           }
 
           // 4. 设置为当前方案（如果不是当前方案）
           if (!(!currentScheme || savedScheme.id !== currentScheme.id)) {
-            _context2.next = 49;
+            _context2.next = 52;
             break;
           }
-          _context2.next = 49;
+          _context2.next = 52;
           return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, savedScheme.id);
-        case 49:
-          _context2.next = 51;
+        case 52:
+          _context2.next = 54;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
-        case 51:
+        case 54:
           // 5. 关闭弹窗
           onClose();
-          _context2.next = 58;
+          _context2.next = 61;
           break;
-        case 54:
-          _context2.prev = 54;
+        case 57:
+          _context2.prev = 57;
           _context2.t0 = _context2["catch"](8);
           console.error('保存列配置到方案失败:', _context2.t0);
           _antd.message.error('保存列配置失败');
-        case 58:
+        case 61:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[8, 54]]);
+    }, _callee2, null, [[8, 57]]);
   })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, allColDefs, onClose]);
 
   // 保存为新方案
@@ -661,21 +676,22 @@ var ColumnSetting = function ColumnSetting(_ref) {
         case 3:
           _context3.prev = 3;
           if (!(activeTab === 'columns' && form)) {
-            _context3.next = 17;
+            _context3.next = 18;
             break;
           }
           values = form.values;
           columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
           // 【修复】传入 allColDefs 以保留自定义属性（cellRenderer 等）
           gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(values.items, allColDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
+          _logger.logger.debug('[ColumnSetting] 另存为方案 - 更新 columnDefs');
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
-          _context3.next = 11;
+          _context3.next = 12;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 100);
           });
-        case 11:
+        case 12:
           // 【修复】然后应用列状态（宽度、隐藏、顺序等）
           columnState = (0, _columnGroupUtils.flatConfigToColumnState)(values.items);
           gridApi.applyColumnState({
@@ -684,18 +700,18 @@ var ColumnSetting = function ColumnSetting(_ref) {
           });
 
           // 等待状态更新
-          _context3.next = 15;
+          _context3.next = 16;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
-        case 15:
-          _context3.next = 19;
+        case 16:
+          _context3.next = 20;
           break;
-        case 17:
+        case 18:
           // 如果在"方案管理"标签页，使用当前表单数据
           _values = form === null || form === void 0 ? void 0 : form.values;
           columnConfigToSave = (_values === null || _values === void 0 ? void 0 : _values.items) || [];
-        case 19:
+        case 20:
           // 获取过滤器模型
           filterModel = gridApi.getFilterModel();
           newScheme = {
@@ -708,9 +724,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
             isSystem: false
             // createdAt 和 updatedAt 由存储适配器自动生成
           };
-          _context3.next = 23;
+          _context3.next = 24;
           return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
-        case 23:
+        case 24:
           _antd.message.success('方案保存成功');
           setSaveSchemeVisible(false);
           setSchemeName('');
@@ -718,17 +734,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 切换到方案管理标签页,显示新创建的方案
           setActiveTab('schemes');
-          _context3.next = 33;
+          _context3.next = 34;
           break;
-        case 30:
-          _context3.prev = 30;
+        case 31:
+          _context3.prev = 31;
           _context3.t0 = _context3["catch"](3);
           _antd.message.error(_context3.t0.message || '保存方案失败');
-        case 33:
+        case 34:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[3, 30]]);
+    }, _callee3, null, [[3, 31]]);
   })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, allColDefs]);
 
   // 设置默认方案

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

@@ -11,7 +11,7 @@ var _draggableModal = _interopRequireDefault(require("../../draggableModal"));
 var _icons = require("@ant-design/icons");
 var _agGridReact = require("ag-grid-react");
 var _useSchemeManager = require("../context/useSchemeManager");
-var _gridContext = require("../context/gridContext");
+var _queryFormContext = require("../context/queryFormContext");
 var _uuid = require("uuid");
 var _schemeDataMigration = require("../shared/utils/schemeDataMigration");
 var _theme = require("../theme");
@@ -66,11 +66,11 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
     deleteQueryScheme = _useGridSchemes.deleteQueryScheme,
     setCurrentQueryScheme = _useGridSchemes.setCurrentQueryScheme;
 
-  // 从 Context 获取查询表单项和当前顺序
-  var _React$useContext = _react.default.useContext(_gridContext.GridPlusContext),
-    queryFormItems = _React$useContext.queryFormItems,
-    currentQueryOrder = _React$useContext.currentQueryOrder,
-    updateQueryOrder = _React$useContext.updateQueryOrder;
+  // 从查询表单 Context 获取查询表单项和当前顺序(已从 GridPlusContext 拆出)
+  var _useQueryForm = (0, _queryFormContext.useQueryForm)(),
+    queryFormItems = _useQueryForm.queryFormItems,
+    currentQueryOrder = _useQueryForm.currentQueryOrder,
+    updateQueryOrder = _useQueryForm.updateQueryOrder;
 
   // 获取当前表格的查询方案列表
   var schemes = (querySchemes === null || querySchemes === void 0 ? void 0 : querySchemes[gridKey]) || [];

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

@@ -13,8 +13,8 @@ exports.gridStateToFlatConfig = gridStateToFlatConfig;
 exports.isOldSchemeData = isOldSchemeData;
 exports.migrateOldScheme = migrateOldScheme;
 exports.reorderItems = reorderItems;
-var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _lodash = require("lodash");
+var _logger = require("../utils/logger");
 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; }
@@ -26,17 +26,15 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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; }
-/**
+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 与扁平化配置之间的转换
  */
-
 /**
  * 生成唯一 ID
  */
 var generateId = exports.generateId = function generateId() {
-  return (0, _uniqueId2.default)('col_');
+  return (0, _lodash.uniqueId)('col_');
 };
 
 /**
@@ -283,6 +281,12 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
       }
     });
     if (newColumnsWithIndex.length > 0) {
+      _logger.logger.debug('[flatConfigToGridState] 检测到新增列，将插入到原始位置:', {
+        newColumnFields: newColumnsWithIndex.map(function (item) {
+          return item.col.field;
+        })
+      });
+
       // 将新增列插入到正确位置（基于其在原始定义中的相对位置）
       var _iterator4 = _createForOfIteratorHelper(newColumnsWithIndex),
         _step4;
@@ -531,6 +535,12 @@ function flatConfigToColumnState(flatConfig, originalColumnDefs) {
       }
     });
     if (newColumnsWithIndex.length > 0) {
+      _logger.logger.debug('[flatConfigToColumnState] 检测到新增列，将插入到原始位置:', {
+        newColumnFields: newColumnsWithIndex.map(function (item) {
+          return item.col.field;
+        })
+      });
+
       // 将新增列插入到正确位置（基于其在原始定义中的相对位置）
       var _iterator6 = _createForOfIteratorHelper(newColumnsWithIndex),
         _step6;

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

@@ -176,9 +176,18 @@ export interface ToolBarRenderParams {
     queryFilter?: QueryFilterState;
     /** 分页信息 */
     paginationInfo?: {
+        /** @deprecated 改用 page */
         current: number;
+        /** @deprecated 改用 page/pageSize */
         skipCount: number;
+        /** @deprecated 改用 page/pageSize */
         maxResultCount: number;
+        /** 当前页码（1-based）
+         * @author nokecy */
+        page?: number;
+        /** 每页条数
+         * @author nokecy */
+        pageSize?: number;
     };
 }
 /**

package/dist/cjs/ag-grid-plus/utils/aggregation.d.ts

@@ -0,0 +1,17 @@
+/**
+ * AG-Grid 底部汇总聚合纯函数(从 ag-gridPlus.tsx 抽出,行为原样)。
+ * @author nokecy
+ */
+export interface CalculationColumnConfig {
+    field: string;
+    calculateType: 'sum' | 'avg' | 'standardDeviation';
+    transactionAmount: number;
+    formatWithCommas?: boolean;
+    cellRenderer?: any;
+}
+export declare const isValidNumber: (value: any) => boolean;
+export declare const sumField: (field: string, data: any[]) => number;
+export declare const avgField: (field: string, data: any[]) => number;
+export declare const stdDevField: (field: string, data: any[]) => number;
+export declare const formatWithCommas: (value: number) => string;
+export declare const computeAggregationRow: (calcColFields: CalculationColumnConfig[], data: any[]) => any[];

package/dist/cjs/ag-grid-plus/utils/aggregation.js

@@ -0,0 +1,101 @@
+"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
+});
+exports.sumField = exports.stdDevField = exports.isValidNumber = exports.formatWithCommas = exports.computeAggregationRow = exports.avgField = void 0;
+var _lodash = _interopRequireWildcard(require("lodash"));
+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; }
+/**
+ * AG-Grid 底部汇总聚合纯函数(从 ag-gridPlus.tsx 抽出,行为原样)。
+ * @author nokecy
+ */
+
+var isValidNumber = exports.isValidNumber = function isValidNumber(value) {
+  return typeof value === 'number' && !isNaN(value);
+};
+var sumField = exports.sumField = function sumField(field, data) {
+  return _lodash.default.sumBy(data, function (cur) {
+    if (cur && isValidNumber(cur[field])) {
+      return cur[field];
+    }
+    return 0;
+  });
+};
+var avgField = exports.avgField = function avgField(field, data) {
+  // 分子分母口径统一为「有效数字」,避免除零得 NaN
+  var validValues = data.filter(function (cur) {
+    return cur && isValidNumber(cur[field]);
+  });
+  if (validValues.length === 0) return 0;
+  var sum = _lodash.default.sumBy(validValues, function (cur) {
+    return cur[field];
+  });
+  return sum / validValues.length;
+};
+
+// 注:现存口径小瑕疵——mean 的分母用有效值数,sumField 对全部行求和(无效计 0);
+// variance 遍历全部行且判定用 !== undefined/null(非 isValidNumber)。首刀只保持原行为,不修正。
+var stdDevField = exports.stdDevField = function stdDevField(field, data) {
+  var validValues = data.filter(function (cur) {
+    return isValidNumber(cur[field]);
+  });
+  var count = validValues.length;
+  if (count === 0) return 0;
+  var mean = sumField(field, data) / count;
+  var variance = _lodash.default.sumBy(data, 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 formatWithCommas = exports.formatWithCommas = function formatWithCommas(value) {
+  return (value / 1).toLocaleString(undefined, {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2
+  });
+};
+
+// sum 求和 / avg 平均值 / standardDeviation 标准差
+var computeAggregationRow = exports.computeAggregationRow = function computeAggregationRow(calcColFields, data) {
+  var calculateArrCopy = [];
+  var calculateData = {
+    id: (0, _lodash.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(sumField(i.field, data).toFixed(sumPrecision));
+            calculateData[i.field] = i.formatWithCommas ? formatWithCommas(sumValue) : sumValue;
+            break;
+          }
+        case 'avg':
+          {
+            var avgPrecision = typeof i.transactionAmount === 'number' ? i.transactionAmount : 2;
+            calculateData[i.field] = Number(avgField(i.field, data).toFixed(avgPrecision));
+            break;
+          }
+        case 'standardDeviation':
+          {
+            var stdPrecision = typeof i.transactionAmount === 'number' ? i.transactionAmount : 2;
+            calculateData[i.field] = Number(stdDevField(i.field, data).toFixed(stdPrecision));
+            break;
+          }
+        default:
+          break;
+      }
+    }
+  });
+  if (Object.keys(calculateData).length > 0) {
+    calculateArrCopy.push(calculateData);
+  }
+  return calculateArrCopy;
+};

package/dist/cjs/ag-grid-plus/utils/columnProcessors.js

@@ -11,10 +11,10 @@ exports.handleGridPlusColumnState = handleGridPlusColumnState;
 exports.inferDataType = inferDataType;
 exports.processEllipsisColumn = processEllipsisColumn;
 exports.processEnumColumn = processEnumColumn;
-var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _antdV = require("@formily/antd-v5");
+var _lodash = require("lodash");
 var _constants = require("./constants");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
@@ -49,7 +49,7 @@ var Text = _antd.Typography.Text;
  */
 function handleGridPlusColumnState(columnState) {
   var cellConfigMap = {};
-  if ((0, _isArray2.default)(columnState)) {
+  if ((0, _lodash.isArray)(columnState)) {
     columnState.forEach(function (item) {
       if (item.field && (item.cellClass || item.suppressHeaderFilterButton !== undefined || item.groupName)) {
         cellConfigMap[item.field] = {

package/dist/cjs/ag-grid-plus/utils/entityExtensionColumns.d.ts

@@ -7,17 +7,26 @@
 import type { ExtendedColDef, EntityExtensionField, HostEntityExtensions } from '../types';
 /**
  * 将单个扩展字段转换为列定义
- * 使用 extraProperties.xxx 嵌套路径访问数据
+ * 使用 {extraPropertiesPath}.xxx 嵌套路径访问数据
  *
  * @param field 扩展字段定义
+ * @param extraPropertiesPath 扩展属性的路径前缀，默认 'extraProperties'（保持向后兼容）
  * @returns AG-Grid 列定义
+ * @author nokecy
+ *
+ * @warning 请勿将此函数直接传给 Array.prototype.map()。
+ * Array.map 会将 (element, index, array) 全部传入，index（数字）会绑定到
+ * extraPropertiesPath，导致 field 路径变为 '0.foo'、'1.bar' 等非法值。
+ * 请始终用箭头函数包装：someArray.map((f) => fieldToColumnDef(f, path))
  */
-export declare function fieldToColumnDef(field: EntityExtensionField): ExtendedColDef;
+export declare function fieldToColumnDef(field: EntityExtensionField, extraPropertiesPath?: string): ExtendedColDef;
 /**
  * 获取指定实体的扩展列定义
  *
  * @param entityType 实体类型全名 (如 "Burn.Product.Domain.Product")
  * @param extensions 实体扩展配置映射
+ * @param extraPropertiesPath 扩展属性的路径前缀，默认 'extraProperties'（保持向后兼容）
  * @returns 扩展列定义数组，按 sortOrder 排序
+ * @author nokecy
  */
-export declare function getEntityExtensionColumns(entityType: string | undefined, extensions?: HostEntityExtensions): ExtendedColDef[];
+export declare function getEntityExtensionColumns(entityType: string | undefined, extensions?: HostEntityExtensions, extraPropertiesPath?: string): ExtendedColDef[];

package/dist/cjs/ag-grid-plus/utils/entityExtensionColumns.js

@@ -93,19 +93,29 @@ var dataTypeColumnConfig = {
 
 /**
  * 将单个扩展字段转换为列定义
- * 使用 extraProperties.xxx 嵌套路径访问数据
+ * 使用 {extraPropertiesPath}.xxx 嵌套路径访问数据
  *
  * @param field 扩展字段定义
+ * @param extraPropertiesPath 扩展属性的路径前缀，默认 'extraProperties'（保持向后兼容）
  * @returns AG-Grid 列定义
+ * @author nokecy
+ *
+ * @warning 请勿将此函数直接传给 Array.prototype.map()。
+ * Array.map 会将 (element, index, array) 全部传入，index（数字）会绑定到
+ * extraPropertiesPath，导致 field 路径变为 '0.foo'、'1.bar' 等非法值。
+ * 请始终用箭头函数包装：someArray.map((f) => fieldToColumnDef(f, path))
  */
 function fieldToColumnDef(field) {
+  var extraPropertiesPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'extraProperties';
+  // 防御 Array.map 将 index（number）传入第二参数的情况，回退到默认路径
+  var resolvedPath = typeof extraPropertiesPath === 'string' ? extraPropertiesPath : 'extraProperties';
   var config = dataTypeColumnConfig[field.dataType] || {
     width: 150,
     hideInSearch: false
   };
   var colDef = _objectSpread(_objectSpread({
-    // 使用嵌套路径访问 extraProperties 中的数据 @author nokecy
-    field: "extraProperties.".concat(field.name),
+    // 使用可配置前缀的嵌套路径访问扩展属性数据
+    field: "".concat(resolvedPath, ".").concat(field.name),
     headerName: field.displayName,
     width: config.width,
     hideInSearch: config.hideInSearch
@@ -122,9 +132,12 @@ function fieldToColumnDef(field) {
  *
  * @param entityType 实体类型全名 (如 "Burn.Product.Domain.Product")
  * @param extensions 实体扩展配置映射
+ * @param extraPropertiesPath 扩展属性的路径前缀，默认 'extraProperties'（保持向后兼容）
  * @returns 扩展列定义数组，按 sortOrder 排序
+ * @author nokecy
  */
 function getEntityExtensionColumns(entityType, extensions) {
+  var extraPropertiesPath = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'extraProperties';
   // 边界情况处理：无效输入直接返回空数组
   var entityConfig = entityType ? extensions === null || extensions === void 0 ? void 0 : extensions[entityType] : undefined;
   var fields = entityConfig === null || entityConfig === void 0 ? void 0 : entityConfig.fields;
@@ -132,9 +145,11 @@ function getEntityExtensionColumns(entityType, extensions) {
     return [];
   }
 
-  // 按 sortOrder 排序后转换为列定义
+  // 按 sortOrder 排序后转换为列定义，透传路径前缀
   return _toConsumableArray(fields).sort(function (a, b) {
     var _a$sortOrder, _b$sortOrder;
     return ((_a$sortOrder = a.sortOrder) !== null && _a$sortOrder !== void 0 ? _a$sortOrder : 0) - ((_b$sortOrder = b.sortOrder) !== null && _b$sortOrder !== void 0 ? _b$sortOrder : 0);
-  }).map(fieldToColumnDef);
+  }).map(function (f) {
+    return fieldToColumnDef(f, extraPropertiesPath);
+  });
 }

package/dist/cjs/ag-grid-plus/utils/queryFormDerivation.d.ts

@@ -0,0 +1,19 @@
+/**
+ * 查询表单项派生纯函数(从 ag-gridPlus.tsx 抽出,行为原样)。
+ * @author nokecy
+ */
+/**
+ * 按 itemsOrder 数组对查询表单项排序。
+ * - itemsOrder 为空/未传:原样返回(同一引用,memo 友好)。
+ * - 未在 itemsOrder 中的项排到末尾,两者都不在则保持相对顺序。
+ */
+export declare function sortFormItemsByOrder<T extends {
+    field: string;
+}>(items: T[], itemsOrder?: string[]): T[];
+/**
+ * 过滤掉 hiddenFields 中的查询表单项。
+ * - hiddenFields 为空:原样返回(同一引用,memo 友好)。
+ */
+export declare function filterHiddenFormItems<T extends {
+    field: string;
+}>(items: T[], hiddenFields: string[]): T[];

package/dist/cjs/ag-grid-plus/utils/queryFormDerivation.js

@@ -0,0 +1,49 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.filterHiddenFormItems = filterHiddenFormItems;
+exports.sortFormItemsByOrder = sortFormItemsByOrder;
+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 _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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; }
+/**
+ * 查询表单项派生纯函数(从 ag-gridPlus.tsx 抽出,行为原样)。
+ * @author nokecy
+ */
+
+/**
+ * 按 itemsOrder 数组对查询表单项排序。
+ * - itemsOrder 为空/未传:原样返回(同一引用,memo 友好)。
+ * - 未在 itemsOrder 中的项排到末尾,两者都不在则保持相对顺序。
+ */
+function sortFormItemsByOrder(items, itemsOrder) {
+  if (!itemsOrder || itemsOrder.length === 0) {
+    return items;
+  }
+  return _toConsumableArray(items).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;
+  });
+}
+
+/**
+ * 过滤掉 hiddenFields 中的查询表单项。
+ * - hiddenFields 为空:原样返回(同一引用,memo 友好)。
+ */
+function filterHiddenFormItems(items, hiddenFields) {
+  if (hiddenFields.length === 0) {
+    return items;
+  }
+  return items.filter(function (item) {
+    return !hiddenFields.includes(item.field);
+  });
+}