@nokecy/qc-ui 1.1.39 → 1.1.40

package/dist/cjs/ag-grid-plus/hooks/useRowId.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 行唯一 ID 生成 Hook(从 ag-gridPlus.tsx 抽出,逻辑原样)。
+ *
+ * 策略(按优先级):
+ * 1. 常见 ID 字段 id/_id/key/uid/uuid(基本类型直取;对象取 value 或 id 属性)
+ * 2. WeakMap 缓存命中
+ * 3. 生成 `${gridKey|grid}-row-{counter}-{timestamp}` 并缓存
+ *
+ * @author nokecy
+ */
+export declare function useRowId(gridKey?: string): {
+    generateUniqueRowId: (data: any) => string;
+};

package/dist/cjs/ag-grid-plus/hooks/useRowId.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useRowId = useRowId;
+var _react = require("react");
+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); }
+/**
+ * 行唯一 ID 生成 Hook(从 ag-gridPlus.tsx 抽出,逻辑原样)。
+ *
+ * 策略(按优先级):
+ * 1. 常见 ID 字段 id/_id/key/uid/uuid(基本类型直取;对象取 value 或 id 属性)
+ * 2. WeakMap 缓存命中
+ * 3. 生成 `${gridKey|grid}-row-{counter}-{timestamp}` 并缓存
+ *
+ * @author nokecy
+ */
+function useRowId(gridKey) {
+  var rowIdCacheRef = (0, _react.useRef)(new WeakMap());
+  var rowIdCounterRef = (0, _react.useRef)(0);
+  var generateUniqueRowId = (0, _react.useCallback)(function (data) {
+    if (!data || _typeof(data) !== 'object') {
+      return "row-empty-".concat(rowIdCounterRef.current++);
+    }
+    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 !== '') {
+        var fieldId = void 0;
+        if (_typeof(value) === 'object' && value !== null) {
+          if (value.value !== undefined) {
+            fieldId = String(value.value);
+          } else if (value.id !== undefined) {
+            fieldId = String(value.id);
+          } else {
+            fieldId = "".concat(field, "-").concat(JSON.stringify(value));
+          }
+        } else {
+          fieldId = String(value);
+        }
+        return fieldId;
+      }
+    }
+    var cachedId = rowIdCacheRef.current.get(data);
+    if (cachedId) {
+      return cachedId;
+    }
+    var uniqueId = "".concat(gridKey || 'grid', "-row-").concat(rowIdCounterRef.current++, "-").concat(Date.now());
+    rowIdCacheRef.current.set(data, uniqueId);
+    return uniqueId;
+  }, [gridKey]);
+  return {
+    generateUniqueRowId: generateUniqueRowId
+  };
+}

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/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,9 +13,8 @@ exports.gridStateToFlatConfig = gridStateToFlatConfig;
 exports.isOldSchemeData = isOldSchemeData;
 exports.migrateOldScheme = migrateOldScheme;
 exports.reorderItems = reorderItems;
-var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
+var _lodash = require("lodash");
 var _logger = require("../utils/logger");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -35,7 +34,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
  * 生成唯一 ID
  */
 var generateId = exports.generateId = function generateId() {
-  return (0, _uniqueId2.default)('col_');
+  return (0, _lodash.uniqueId)('col_');
 };
 
 /**

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);
+  });
+}

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

@@ -0,0 +1,15 @@
+import type { QueryFilterState, ExtendedColDef } from '../types';
+/**
+ * 请求参数构建纯函数(从 ag-gridPlus.tsx onRequest 抽出,行为原样)。
+ * @author nokecy
+ */
+/**
+ * 根据查询模式构建过滤字符串:
+ * - 高级模式(__advancedMode__ 且有 __rules__):走规则转换 convertRulesToFilterString。
+ * - 简单模式:走 convertFilterModel。
+ */
+export declare function buildFilterString(queryFilter: QueryFilterState, columnDefs: ExtendedColDef[]): string;
+/**
+ * 页码 → ABP skipCount。第 1 页为 0,其余为 (current-1)*pageSize。
+ */
+export declare function pageToSkipCount(current: number, pageSize: number): number;

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

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildFilterString = buildFilterString;
+exports.pageToSkipCount = pageToSkipCount;
+var _utils = require("../utils");
+/**
+ * 请求参数构建纯函数(从 ag-gridPlus.tsx onRequest 抽出,行为原样)。
+ * @author nokecy
+ */
+
+/**
+ * 根据查询模式构建过滤字符串:
+ * - 高级模式(__advancedMode__ 且有 __rules__):走规则转换 convertRulesToFilterString。
+ * - 简单模式:走 convertFilterModel。
+ */
+function buildFilterString(queryFilter, columnDefs) {
+  if (queryFilter.__advancedMode__ && queryFilter.__rules__) {
+    return (0, _utils.convertRulesToFilterString)(queryFilter.__rules__, columnDefs);
+  }
+  return (0, _utils.convertFilterModel)(queryFilter, columnDefs);
+}
+
+/**
+ * 页码 → ABP skipCount。第 1 页为 0,其余为 (current-1)*pageSize。
+ */
+function pageToSkipCount(current, pageSize) {
+  return current === 1 ? 0 : (current - 1) * pageSize;
+}

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

@@ -0,0 +1,9 @@
+/**
+ * 行选择纯逻辑(从 ag-gridPlus.tsx 抽出,行为原样)。
+ * @author nokecy
+ */
+/**
+ * 只保留「既被选中、又在当前显示行中」的行(按 getId 计算的行 ID 比对)。
+ * id 为空(falsy)的行不计入匹配。
+ */
+export declare function filterVisibleSelectedRows<T>(selectedRows: T[], displayedRows: T[], getId: (row: T) => string): T[];

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

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.filterVisibleSelectedRows = filterVisibleSelectedRows;
+/**
+ * 行选择纯逻辑(从 ag-gridPlus.tsx 抽出,行为原样)。
+ * @author nokecy
+ */
+
+/**
+ * 只保留「既被选中、又在当前显示行中」的行(按 getId 计算的行 ID 比对)。
+ * id 为空(falsy)的行不计入匹配。
+ */
+function filterVisibleSelectedRows(selectedRows, displayedRows, getId) {
+  return selectedRows.filter(function (selectedRow) {
+    return displayedRows.some(function (displayedRow) {
+      var selectedRowId = getId(selectedRow);
+      var displayedRowId = getId(displayedRow);
+      return selectedRowId && displayedRowId && selectedRowId === displayedRowId;
+    });
+  });
+}

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

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.toTree = exports.flattenTreeDeep = exports.flatten = exports.dateValueFormatter = exports.dateTimeValueFormatter = exports.convertSortModel = exports.convertRulesToFilterString = exports.convertFilterModel = void 0;
-var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _lodash = require("lodash");
 var _gridifyClient = require("gridify-client");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -255,7 +255,7 @@ var flattenTreeDeep = exports.flattenTreeDeep = function flattenTreeDeep(treeDat
     });
     return res;
   };
-  var data = (0, _cloneDeep2.default)(treeData);
+  var data = (0, _lodash.cloneDeep)(treeData);
   var res = [];
   flattenData(data, res, null, childrenName);
   return res;

package/dist/cjs/array-table/arrayBase.js

@@ -60,7 +60,9 @@ ArrayBase.Item = function (_ref) {
   }, children);
 };
 ArrayBase.Index = function (props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks -- Formily 复合组件,ArrayBase.Index 实为函数组件,误报
   var index = useIndex();
+  // eslint-disable-next-line react-hooks/rules-of-hooks -- 同上
   var prefixCls = (0, _builtins__.usePrefixCls)('formily-array-base');
   return /*#__PURE__*/_react.default.createElement("span", _extends({}, props, {
     className: "".concat(prefixCls, "-index")

package/dist/cjs/array-table/utils.js

@@ -279,10 +279,26 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
     var readOnly = isColumnReadOnlyEligible(arrayPattern, dataField, columnProps);
     var hasReactions = !!(dataField && dataField['x-reactions']);
     var forceEager = (columnProps === null || columnProps === void 0 ? void 0 : columnProps.forceAgField) === true;
+    // Switch/Checkbox 是「单击直控」组件:可编辑态本就该常驻渲染真控件(优化前即如此)。
+    // 懒挂载会把它降成「是/否」纯文本(点击才挂出开关),用户会以为开关消失。故可编辑态强制 eager。
+    // 只读态(下方 ① 路径)仍走「是/否」文本快路径不受影响。@author nokecy
+    var isInlineToggle = component === 'Switch' || component === 'Checkbox';
+
+    // formatter 路径(只读快路径/懒挂载)经 AG-Grid params.value 取值,而 params.value 由 colDef.field(=name)驱动。
+    // 但设计器生成的 schema 里 Column key 多为随机 designable-id 且无 dataIndex,真实数据键在内层字段 name 上,
+    // 两者不一致时 record[name] 恒为 undefined → 单元格空白(点击挂 AgField 才按内层字段名显真值)。
+    // 故按内层字段名补 valueGetter(仅在与 name 不一致时,保持 name===字段名 的现状)。@author nokecy
+    var dataFieldName = dataField === null || dataField === void 0 ? void 0 : dataField.name;
+    var valueGetter = dataFieldName && dataFieldName !== name ? function (params) {
+      var _params$data;
+      return params === null || params === void 0 || (_params$data = params.data) === null || _params$data === void 0 ? void 0 : _params$data[dataFieldName];
+    } : undefined;
 
     // ① 只读纯文本
     if (readOnly && formatter) {
-      return buf.concat(_objectSpread(_objectSpread({}, base), {}, {
+      return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+        valueGetter: valueGetter
+      } : {}), {}, {
         // 显式清掉可能从 safeColumnProps 漏带的 cellRenderer(AG-Grid 中 renderer 优先级高于 formatter)
         cellRenderer: undefined,
         valueFormatter: function valueFormatter(params) {
@@ -294,9 +310,11 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
       }));
     }
 
-    // ② 可编辑懒挂载
-    if (!readOnly && formatter && !hasReactions && !forceEager) {
-      return buf.concat(_objectSpread(_objectSpread({}, base), {}, {
+    // ② 可编辑懒挂载(排除单击直控的 Switch/Checkbox:须 eager 出真控件)
+    if (!readOnly && formatter && !hasReactions && !forceEager && !isInlineToggle) {
+      return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+        valueGetter: valueGetter
+      } : {}), {}, {
         cellRenderer: LazyAgField,
         cellRendererParams: {
           dataSource: dataSource,