@nokecy/qc-ui 1.1.86 → 1.1.88

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

@@ -21,6 +21,27 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
  * @author nokecy
  */
 import dayjs from 'dayjs';
+
+/** 选择器的展示字段；只影响回显，不改变 labelInValue 的提交值。@author nokecy */
+
+/** 从选择值提取展示文字；编码展示不能因描述为空或过期而改变。@author nokecy */
+export var formatSelectDisplay = function formatSelectDisplay(value) {
+  var _value$label;
+  var displayField = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'label';
+  if (value == null) return '';
+  if (Array.isArray(value)) return value.map(function (item) {
+    return formatSelectDisplay(item, displayField);
+  }).filter(Boolean).join(', ');
+  if (_typeof(value) === 'object') return formatSelectDisplay(displayField === 'value' ? value.value : (_value$label = value.label) !== null && _value$label !== void 0 ? _value$label : value.value, displayField);
+  return String(value);
+};
+
+/** 给选择组件声明与其回显一致的表格格式化器，组件别名和不同页面各自生效。@author nokecy */
+export var withReadOnlyFormatter = function withReadOnlyFormatter(component, formatter) {
+  return Object.assign(component, {
+    readOnlyFormatter: formatter
+  });
+};
 /** 从字段 schema / 列 props 里尽量取到 Select 的可选项(value->label 映射用) */
 var resolveOptions = function resolveOptions(ctx) {
   var _ref, _ref2, _ref3, _fieldSchema$enum, _fieldSchema$xCompon, _fieldSchema$xCompon2;
@@ -33,10 +54,10 @@ var resolveOptions = function resolveOptions(ctx) {
 
 /** 单个值映射成 label:兼容 labelInValue 对象、{label,value} 选项、原始值 */
 var mapOptionLabel = function mapOptionLabel(value, options) {
-  var _ref4, _value$label, _ref5, _hit$label;
+  var _ref4, _value$label2, _ref5, _hit$label;
   if (value == null) return '';
   // labelInValue: 值本身就是 { label, value }
-  if (_typeof(value) === 'object') return String((_ref4 = (_value$label = value.label) !== null && _value$label !== void 0 ? _value$label : value.value) !== null && _ref4 !== void 0 ? _ref4 : '');
+  if (_typeof(value) === 'object') return String((_ref4 = (_value$label2 = value.label) !== null && _value$label2 !== void 0 ? _value$label2 : value.value) !== null && _ref4 !== void 0 ? _ref4 : '');
   // 严格相等优先;退一步按 String 宽松比对,容忍后端类型漂移(如返回 "0" 而 enum 存数字 0)
   var hit = options.find(function (o) {
     var ov = o && _typeof(o) === 'object' ? o.value : o;
@@ -49,7 +70,9 @@ var textFormatter = function textFormatter(value) {
   return value == null ? '' : String(value);
 };
 var selectFormatter = function selectFormatter(value, ctx) {
+  var _ctx$fieldSchema;
   if (value == null) return '';
+  if (((_ctx$fieldSchema = ctx.fieldSchema) === null || _ctx$fieldSchema === void 0 || (_ctx$fieldSchema = _ctx$fieldSchema['x-component-props']) === null || _ctx$fieldSchema === void 0 ? void 0 : _ctx$fieldSchema.displayField) === 'value') return formatSelectDisplay(value, 'value');
   var options = resolveOptions(ctx);
   // 多选:数组 -> 逗号拼接
   if (Array.isArray(value)) {
@@ -73,14 +96,14 @@ var defaultDateFormat = function defaultDateFormat(component, props) {
   return 'YYYY-MM-DD';
 };
 var dateFormatter = function dateFormatter(value, ctx) {
-  var _ctx$fieldSchema, _ctx$columnProps, _ctx$fieldSchema2;
+  var _ctx$fieldSchema2, _ctx$columnProps, _ctx$fieldSchema3;
   if (value == null || value === '') return '';
-  var props = (_ctx$fieldSchema = ctx.fieldSchema) === null || _ctx$fieldSchema === void 0 ? void 0 : _ctx$fieldSchema['x-component-props'];
+  var props = (_ctx$fieldSchema2 = ctx.fieldSchema) === null || _ctx$fieldSchema2 === void 0 ? void 0 : _ctx$fieldSchema2['x-component-props'];
   // antd 的 format 还可以是数组/函数，文本态只认字符串，其余回到默认
   var configured = [(_ctx$columnProps = ctx.columnProps) === null || _ctx$columnProps === void 0 ? void 0 : _ctx$columnProps.format, props === null || props === void 0 ? void 0 : props.format].find(function (f) {
     return typeof f === 'string' && f;
   });
-  var fmt = configured !== null && configured !== void 0 ? configured : defaultDateFormat((_ctx$fieldSchema2 = ctx.fieldSchema) === null || _ctx$fieldSchema2 === void 0 ? void 0 : _ctx$fieldSchema2['x-component'], props);
+  var fmt = configured !== null && configured !== void 0 ? configured : defaultDateFormat((_ctx$fieldSchema3 = ctx.fieldSchema) === null || _ctx$fieldSchema3 === void 0 ? void 0 : _ctx$fieldSchema3['x-component'], props);
   if (typeof value.format === 'function') return value.format(fmt);
   // 后端回来的多是 ISO 串(2024-10-19T00:00:00)或时间戳:与 Formily readPretty 一致,按 dayjs(value).format(fmt) 显示;
   // 解析不了的文本(如「待定」、纯时间 08:30:00)原样显示,不吞掉。dayjs 随 antd 传递依赖引入,本库其他模块已直接使用。
@@ -93,9 +116,9 @@ var dateFormatter = function dateFormatter(value, ctx) {
  * 与点开后的 InputNumber 一致；没配这两项时与原样输出相同。
  */
 var numberFormatter = function numberFormatter(value, ctx) {
-  var _ctx$fieldSchema$xCo, _ctx$fieldSchema3, _ctx$columnProps$prec, _ctx$columnProps2, _ctx$columnProps$form, _ctx$columnProps3;
+  var _ctx$fieldSchema$xCo, _ctx$fieldSchema4, _ctx$columnProps$prec, _ctx$columnProps2, _ctx$columnProps$form, _ctx$columnProps3;
   if (value == null || value === '') return '';
-  var props = (_ctx$fieldSchema$xCo = (_ctx$fieldSchema3 = ctx.fieldSchema) === null || _ctx$fieldSchema3 === void 0 ? void 0 : _ctx$fieldSchema3['x-component-props']) !== null && _ctx$fieldSchema$xCo !== void 0 ? _ctx$fieldSchema$xCo : {};
+  var props = (_ctx$fieldSchema$xCo = (_ctx$fieldSchema4 = ctx.fieldSchema) === null || _ctx$fieldSchema4 === void 0 ? void 0 : _ctx$fieldSchema4['x-component-props']) !== null && _ctx$fieldSchema$xCo !== void 0 ? _ctx$fieldSchema$xCo : {};
   var precision = (_ctx$columnProps$prec = (_ctx$columnProps2 = ctx.columnProps) === null || _ctx$columnProps2 === void 0 ? void 0 : _ctx$columnProps2.precision) !== null && _ctx$columnProps$prec !== void 0 ? _ctx$columnProps$prec : props.precision;
   var num = Number(value);
   var base = typeof precision === 'number' && precision >= 0 && Number.isFinite(num) ? num.toFixed(precision) : String(value);
@@ -113,9 +136,9 @@ var numberFormatter = function numberFormatter(value, ctx) {
   return base;
 };
 var booleanFormatter = function booleanFormatter(value, ctx) {
-  var _ctx$fieldSchema$xCo2, _ctx$fieldSchema4, _props$checkedChildre, _props$unCheckedChild;
+  var _ctx$fieldSchema$xCo2, _ctx$fieldSchema5, _props$checkedChildre, _props$unCheckedChild;
   if (value == null || value === '') return '';
-  var props = (_ctx$fieldSchema$xCo2 = (_ctx$fieldSchema4 = ctx.fieldSchema) === null || _ctx$fieldSchema4 === void 0 ? void 0 : _ctx$fieldSchema4['x-component-props']) !== null && _ctx$fieldSchema$xCo2 !== void 0 ? _ctx$fieldSchema$xCo2 : {};
+  var props = (_ctx$fieldSchema$xCo2 = (_ctx$fieldSchema5 = ctx.fieldSchema) === null || _ctx$fieldSchema5 === void 0 ? void 0 : _ctx$fieldSchema5['x-component-props']) !== null && _ctx$fieldSchema$xCo2 !== void 0 ? _ctx$fieldSchema$xCo2 : {};
   var truthy = (_props$checkedChildre = props.checkedChildren) !== null && _props$checkedChildre !== void 0 ? _props$checkedChildre : '是';
   var falsy = (_props$unCheckedChild = props.unCheckedChildren) !== null && _props$unCheckedChild !== void 0 ? _props$unCheckedChild : '否';
   return value ? String(truthy) : String(falsy);
@@ -152,15 +175,17 @@ var registry = {
  * 消费方用 registerReadOnlyFormatter 注册专用格式化器覆盖。@author nokecy
  */
 export var fallbackFormatter = function fallbackFormatter(value, ctx) {
+  var _ctx$fieldSchema6;
   if (value == null || value === '') return '';
+  if (((_ctx$fieldSchema6 = ctx.fieldSchema) === null || _ctx$fieldSchema6 === void 0 || (_ctx$fieldSchema6 = _ctx$fieldSchema6['x-component-props']) === null || _ctx$fieldSchema6 === void 0 ? void 0 : _ctx$fieldSchema6.displayField) === 'value') return formatSelectDisplay(value, 'value');
   if (Array.isArray(value)) return value.map(function (v) {
     return fallbackFormatter(v, ctx);
   }).filter(Boolean).join(', ');
   if (typeof value === 'boolean') return booleanFormatter(value, ctx);
   if (_typeof(value) === 'object') {
-    var _value$label2;
+    var _value$label3;
     if (typeof value.format === 'function') return dateFormatter(value, ctx);
-    var shown = (_value$label2 = value.label) !== null && _value$label2 !== void 0 ? _value$label2 : value.value;
+    var shown = (_value$label3 = value.label) !== null && _value$label3 !== void 0 ? _value$label3 : value.value;
     return shown == null ? '' : String(shown);
   }
   return String(value);
@@ -236,8 +261,12 @@ export var getReadOnlyRenderer = function getReadOnlyRenderer(component) {
 /**
  * 取某组件类型的只读格式化器。命中返回函数,未命中返回 null(调用方回退 AgField)。
  */
-export var getReadOnlyFormatter = function getReadOnlyFormatter(component) {
+export var getReadOnlyFormatter = function getReadOnlyFormatter(component, components) {
   var _registry$component;
   if (!component) return null;
+  var control = component.split('.').reduce(function (current, key) {
+    return current === null || current === void 0 ? void 0 : current[key];
+  }, components);
+  if (typeof (control === null || control === void 0 ? void 0 : control.readOnlyFormatter) === 'function') return control.readOnlyFormatter;
   return (_registry$component = registry[component]) !== null && _registry$component !== void 0 ? _registry$component : null;
 };

package/dist/esm/array-table/rowIdentity.d.ts

@@ -0,0 +1,17 @@
+import type { ArrayField } from '@formily/core';
+/**
+ * 读取业务行标识；尚未补入表单的行按对象缓存临时标识，不在渲染期间改写表单。
+ * @param row 明细行。
+ * @param generatedIds 当前表格已分配的临时行标识。
+ * @returns AG-Grid 使用的稳定字符串标识。
+ * @author nokecy
+ */
+export declare const getArrayTableRowId: (row: Record<string, any>, generatedIds: WeakMap<object, string>) => string;
+/**
+ * 在 effect 中为缺少业务标识的明细补入可枚举 _id，使业务克隆行时保留 AG-Grid 行身份。
+ * 复用首次渲染已分配的标识，补值本身不会使单元格重挂；已有 _id/id（含 0）保持原值。
+ * @param field 当前明细数组字段。
+ * @param generatedIds 当前表格已分配的临时行标识。
+ * @author nokecy
+ */
+export declare const ensureArrayTableRowIds: (field: ArrayField, generatedIds: WeakMap<object, string>) => void;

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

@@ -0,0 +1,37 @@
+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); }
+import uniqueId from 'lodash/uniqueId';
+
+/**
+ * 读取业务行标识；尚未补入表单的行按对象缓存临时标识，不在渲染期间改写表单。
+ * @param row 明细行。
+ * @param generatedIds 当前表格已分配的临时行标识。
+ * @returns AG-Grid 使用的稳定字符串标识。
+ * @author nokecy
+ */
+export var getArrayTableRowId = function getArrayTableRowId(row, generatedIds) {
+  var _row$_id;
+  var existingId = (_row$_id = row._id) !== null && _row$_id !== void 0 ? _row$_id : row.id;
+  if (existingId != null) return String(existingId);
+  var generatedId = generatedIds.get(row);
+  if (!generatedId) {
+    generatedId = uniqueId('row_');
+    generatedIds.set(row, generatedId);
+  }
+  return generatedId;
+};
+
+/**
+ * 在 effect 中为缺少业务标识的明细补入可枚举 _id，使业务克隆行时保留 AG-Grid 行身份。
+ * 复用首次渲染已分配的标识，补值本身不会使单元格重挂；已有 _id/id（含 0）保持原值。
+ * @param field 当前明细数组字段。
+ * @param generatedIds 当前表格已分配的临时行标识。
+ * @author nokecy
+ */
+export var ensureArrayTableRowIds = function ensureArrayTableRowIds(field, generatedIds) {
+  if (!Array.isArray(field.value)) return;
+  field.value.forEach(function (row, index) {
+    var _row$_id2;
+    if (row == null || _typeof(row) !== 'object' || ((_row$_id2 = row._id) !== null && _row$_id2 !== void 0 ? _row$_id2 : row.id) != null) return;
+    field.form.setValuesIn(field.path.concat(index).concat('_id'), getArrayTableRowId(row, generatedIds));
+  });
+};

package/dist/esm/array-table/sorting.d.ts

@@ -0,0 +1,3 @@
+import { type ReadOnlyFormatter } from './readOnlyFormatters';
+/** 按列的展示字段和数据类型比较明细值，保留原始选择对象供表单绑定使用。@author nokecy */
+export declare const createArrayTableComparator: (fieldSchema: any, columnProps: any, formatter: ReadOnlyFormatter | null) => (a: any, b: any) => number;

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

@@ -0,0 +1,40 @@
+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); }
+import Decimal from 'decimal.js';
+import dayjs from 'dayjs';
+import { formatSelectDisplay } from "./readOnlyFormatters";
+
+/** 按列的展示字段和数据类型比较明细值，保留原始选择对象供表单绑定使用。@author nokecy */
+export var createArrayTableComparator = function createArrayTableComparator(fieldSchema, columnProps, formatter) {
+  var _fieldSchema$xCompon, _fieldSchema$xCompon2;
+  var component = String((_fieldSchema$xCompon = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component']) !== null && _fieldSchema$xCompon !== void 0 ? _fieldSchema$xCompon : '');
+  var numeric = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.type) === 'number' || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.type) === 'integer' || /^(InputNumber|NumberPicker|DecimalPicker|MoneyPicker)$/.test(component) || [columnProps === null || columnProps === void 0 ? void 0 : columnProps.type].flat().some(function (type) {
+    return type === 'numericColumn' || type === 'numberColumn';
+  });
+  var temporal = /^(DatePicker|TimePicker)(\.|$)/.test(component);
+  var displayField = (fieldSchema === null || fieldSchema === void 0 || (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.displayField) === 'value' ? 'value' : 'label';
+  var scalar = function scalar(value) {
+    var _value$label;
+    if (value == null) return null;
+    if (Array.isArray(value)) return formatSelectDisplay(value, displayField);
+    if (_typeof(value) === 'object' && ('value' in value || 'label' in value)) return scalar(displayField === 'value' ? value.value : (_value$label = value.label) !== null && _value$label !== void 0 ? _value$label : value.value);
+    if (temporal && dayjs(value).isValid()) return dayjs(value).valueOf();
+    if (numeric || typeof value === 'number' || typeof value === 'boolean') return value;
+    return formatter ? formatter(value, {
+      columnProps: columnProps,
+      fieldSchema: fieldSchema
+    }) : String(value);
+  };
+  return function (a, b) {
+    var left = scalar(a);
+    var right = scalar(b);
+    if (left == null || left === '') return right == null || right === '' ? 0 : -1;
+    if (right == null || right === '') return 1;
+    if (numeric || temporal || typeof left === 'number' && typeof right === 'number') {
+      try {
+        return new Decimal(left).cmp(new Decimal(right));
+      } catch (_unused) {/* 无效数值按展示文字排序。 */}
+    }
+    if (typeof left === 'boolean' && typeof right === 'boolean') return Number(left) - Number(right);
+    return String(left).localeCompare(String(right), 'zh-CN');
+  };
+};

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

@@ -18,7 +18,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useReducer, useRef } from 'react';
 import { theme } from 'antd';
-import { useField, useFieldSchema, RecursionField, Observer, useExpressionScope } from '@formily/react';
+import { useField, useFieldSchema, RecursionField, Observer, useExpressionScope, SchemaComponentsContext } from '@formily/react';
 import { untracked } from '@formily/reactive';
 import { isArr, lazyMerge } from '@formily/shared';
 import { Schema } from '@formily/json-schema';
@@ -26,6 +26,7 @@ import ArrayBase from "./arrayBase";
 import { fallbackFormatter, getReadOnlyFormatter, getReadOnlyRenderer } from "./readOnlyFormatters";
 import { markHeaderGroup } from "./columnGroup";
 import { CellFocusScope } from "./cellFocusScope";
+import { createArrayTableComparator } from "./sorting";
 var isColumnComponent = function isColumnComponent(schema) {
   var _schema$xComponent;
   return ((_schema$xComponent = schema['x-component']) === null || _schema$xComponent === void 0 ? void 0 : _schema$xComponent.indexOf('Column')) > -1;
@@ -45,6 +46,7 @@ var isActionComponent = function isActionComponent(schema) {
 var useArrayTableSources = function useArrayTableSources() {
   var arrayField = useField();
   var schema = useFieldSchema();
+  var components = React.useContext(SchemaComponentsContext);
   var parseSources = function parseSources(schema) {
     if (isColumnComponent(schema) || isOperationsComponent(schema) || isAdditionComponent(schema)) {
       var _schema$xComponentP, _schema$xComponentP2, _field$component;
@@ -60,7 +62,8 @@ var useArrayTableSources = function useArrayTableSources() {
         //@ts-ignore
         field: field,
         schema: schema,
-        columnProps: columnProps
+        columnProps: columnProps,
+        components: components
       }];
     } else if (schema.properties) {
       return schema.reduceProperties(function (buf, schema) {
@@ -116,19 +119,45 @@ var useArrayTableActions = function useArrayTableActions() {
   if (!schema) throw new Error('can not found schema object');
   return schema.properties ? parseSources(schema.properties['actions'] || {}) : [];
 };
-var AgField = function AgField(_ref) {
-  var _field$value$indexOf, _field$value, _field$value$indexOf2, _ref2, _node$rowIndex;
-  var value = _ref.value,
-    record = _ref.data,
-    dataSource = _ref.dataSource,
-    schema = _ref.schema,
-    field = _ref.field,
-    node = _ref.node;
-  // 数据序绑定:用 field.value.indexOf(record) 取数据数组下标(record === field.value 元素引用)。
-  // 排序/过滤后 node.rowIndex 是显示序 ≠ 数据序,会把单元格绑到别的行——故 indexOf 优先,
-  // 仅在未命中(理论不应发生)时才回退 rowIndex/dataSource。@author nokecy
-  var dataIndex = (_field$value$indexOf = field === null || field === void 0 || (_field$value = field.value) === null || _field$value === void 0 || (_field$value$indexOf2 = _field$value.indexOf) === null || _field$value$indexOf2 === void 0 ? void 0 : _field$value$indexOf2.call(_field$value, record)) !== null && _field$value$indexOf !== void 0 ? _field$value$indexOf : -1;
-  var index = dataIndex >= 0 ? dataIndex : (_ref2 = (_node$rowIndex = node === null || node === void 0 ? void 0 : node.rowIndex) !== null && _node$rowIndex !== void 0 ? _node$rowIndex : dataSource === null || dataSource === void 0 ? void 0 : dataSource.indexOf(record)) !== null && _ref2 !== void 0 ? _ref2 : -1;
+
+/**
+ * 从表单当前数组定位单元格所属行。批量选择可保留 _id/id 并替换整行对象，
+ * AG Grid 在格值未变时仍会复用带旧 data 的渲染器；判空、校验和绑定必须使用当前行。
+ * 不以排序/过滤后的显示行号定位数据，已删除的行也不能绑定到后继行。@author nokecy
+ */
+var resolveCellRow = function resolveCellRow(field, record, node, dataSource) {
+  var _field$value, _node$data;
+  var rows = (_field$value = field === null || field === void 0 ? void 0 : field.value) !== null && _field$value !== void 0 ? _field$value : dataSource;
+  var candidate = (_node$data = node === null || node === void 0 ? void 0 : node.data) !== null && _node$data !== void 0 ? _node$data : record;
+  if (!Array.isArray(rows)) return {
+    index: -1,
+    record: candidate
+  };
+  var index = rows.indexOf(candidate);
+  if (index < 0) {
+    var _ref, _ref2, _candidate$_id;
+    var id = (_ref = (_ref2 = (_candidate$_id = candidate === null || candidate === void 0 ? void 0 : candidate._id) !== null && _candidate$_id !== void 0 ? _candidate$_id : candidate === null || candidate === void 0 ? void 0 : candidate.id) !== null && _ref2 !== void 0 ? _ref2 : record === null || record === void 0 ? void 0 : record._id) !== null && _ref !== void 0 ? _ref : record === null || record === void 0 ? void 0 : record.id;
+    if (id != null) index = rows.findIndex(function (row) {
+      var _row$_id;
+      var rowId = (_row$_id = row === null || row === void 0 ? void 0 : row._id) !== null && _row$_id !== void 0 ? _row$_id : row === null || row === void 0 ? void 0 : row.id;
+      return rowId != null && String(rowId) === String(id);
+    });
+  }
+  return {
+    index: index,
+    record: index >= 0 ? rows[index] : undefined
+  };
+};
+var AgField = function AgField(_ref3) {
+  var value = _ref3.value,
+    record = _ref3.data,
+    dataSource = _ref3.dataSource,
+    schema = _ref3.schema,
+    field = _ref3.field,
+    node = _ref3.node;
+  var _resolveCellRow = resolveCellRow(field, record, node, dataSource),
+    index = _resolveCellRow.index;
+  if (index < 0) return null;
   var children =
   /*#__PURE__*/
   //@ts-ignore
@@ -198,10 +227,10 @@ var readByFieldPath = function readByFieldPath(record, path) {
   if (record == null) return undefined;
   // 对象解构:与 Formily 一致,按成员路径分别取值拼回 {value, label} 对象 @author nokecy
   var destructure = path.startsWith('{') ? parseObjectDestructure(path) : null;
-  if (destructure) return Object.fromEntries(destructure.map(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-      key = _ref4[0],
-      memberPath = _ref4[1];
+  if (destructure) return Object.fromEntries(destructure.map(function (_ref4) {
+    var _ref5 = _slicedToArray(_ref4, 2),
+      key = _ref5[0],
+      memberPath = _ref5[1];
     return [key, readByFieldPath(record, memberPath)];
   }));
   if (path.indexOf('.') < 0) return record[path];
@@ -356,6 +385,7 @@ var LazyAgField = function LazyAgField(params) {
     node = params.node,
     colDef = params.colDef,
     context = params.context,
+    api = params.api,
     formatter = params.formatter,
     renderer = params.renderer,
     columnProps = params.columnProps,
@@ -378,59 +408,88 @@ var LazyAgField = function LazyAgField(params) {
 
   /** 离开本格:校验通过才卸回懒挂载文本。未触碰的空必填格保留控件等待填写。@author nokecy */
   var handleLeave = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(isStale, hadFocus) {
-      var _field$value$indexOf3, _field$value3, _field$value3$indexOf, _field$form;
-      var currentValue, index, cellField;
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(isStale, hadFocus) {
+      var _field$form, _api$isDestroyed;
+      var current, currentValue, index, cellField, latest, _api$refreshCells;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            currentValue = dataKey != null ? readByFieldPath(record, dataKey) : value; // 新增行的必填空格会预先挂载以参与提交校验；若用户从未进入该格，不在点击页面其他位置时
-            // 主动触发校验，但已带值的格子仍可恢复静默文本态。@author nokecy
-            if (!(required && isBlank(currentValue) && !hadFocus)) {
+            current = resolveCellRow(field, record, node, dataSource);
+            if (!(current.index < 0)) {
               _context.next = 3;
               break;
             }
             return _context.abrupt("return");
           case 3:
-            index = (_field$value$indexOf3 = field === null || field === void 0 || (_field$value3 = field.value) === null || _field$value3 === void 0 || (_field$value3$indexOf = _field$value3.indexOf) === null || _field$value3$indexOf === void 0 ? void 0 : _field$value3$indexOf.call(_field$value3, record)) !== null && _field$value$indexOf3 !== void 0 ? _field$value$indexOf3 : -1; // 字段节点按数据路径找(不含 void 容器);从没挂载过就没有节点,无需校验
+            currentValue = dataKey != null ? readByFieldPath(current.record, dataKey) : value; // 新增行的必填空格会预先挂载以参与提交校验；若用户从未进入该格，不在点击页面其他位置时
+            // 主动触发校验，但已带值的格子仍可恢复静默文本态。@author nokecy
+            if (!(required && isBlank(currentValue) && !hadFocus)) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            index = current.index; // 字段节点按数据路径找(不含 void 容器);从没挂载过就没有节点,无需校验
             cellField = index >= 0 && dataKey ? (_field$form = field.form) === null || _field$form === void 0 ? void 0 : _field$form.query(field.path.concat(index).concat(dataKey)).take() : undefined;
             if (!cellField) {
-              _context.next = 14;
+              _context.next = 17;
               break;
             }
-            _context.prev = 6;
-            _context.next = 9;
+            _context.prev = 9;
+            _context.next = 12;
             return cellField.validate();
-          case 9:
-            _context.next = 14;
+          case 12:
+            _context.next = 17;
             break;
-          case 11:
-            _context.prev = 11;
-            _context.t0 = _context["catch"](6);
-            return _context.abrupt("return");
           case 14:
+            _context.prev = 14;
+            _context.t0 = _context["catch"](9);
+            return _context.abrupt("return");
+          case 17:
             if (!isStale()) {
-              _context.next = 16;
+              _context.next = 19;
+              break;
+            }
+            return _context.abrupt("return");
+          case 19:
+            latest = resolveCellRow(field, record, node, dataSource); // 校验期间被替换、删除或移位的行，交给下一次离开重新校验。@author nokecy
+            if (!(latest.index !== index || latest.record !== current.record)) {
+              _context.next = 22;
               break;
             }
             return _context.abrupt("return");
-          case 16:
-            if (!(required && isBlank(dataKey != null ? readByFieldPath(record, dataKey) : undefined))) {
-              _context.next = 18;
+          case 22:
+            if (!(required && isBlank(dataKey != null ? readByFieldPath(latest.record, dataKey) : undefined))) {
+              _context.next = 24;
               break;
             }
             return _context.abrupt("return");
-          case 18:
-            activeCells.delete(key);
+          case 24:
+            if (activeCells.delete(key)) {
+              _context.next = 26;
+              break;
+            }
+            return _context.abrupt("return");
+          case 26:
             rerender();
-          case 20:
+            // 激活集合由 ArrayTable 与渲染器共享；退出时也同步通知 AG Grid 刷新本格，
+            // 不再依赖新增行等整表更新来收回已完成编辑的控件。字段节点和值仍保留。
+            // @author nokecy
+            if (node && colDef !== null && colDef !== void 0 && colDef.field && !(api !== null && api !== void 0 && (_api$isDestroyed = api.isDestroyed) !== null && _api$isDestroyed !== void 0 && _api$isDestroyed.call(api))) {
+              api === null || api === void 0 || (_api$refreshCells = api.refreshCells) === null || _api$refreshCells === void 0 || _api$refreshCells.call(api, {
+                rowNodes: [node],
+                columns: [colDef.field],
+                force: true
+              });
+            }
+          case 28:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 11]]);
+      }, _callee, null, [[9, 14]]);
     }));
     return function handleLeave(_x, _x2) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -443,11 +502,11 @@ var LazyAgField = function LazyAgField(params) {
    * 仅选项类组件且有值时才查；按精确地址取、放在 untracked 里，不让每个格子都订阅整张字段表。@author nokecy
    */
   var liveDataSource = function liveDataSource(liveValue) {
-    var _field$value$indexOf4, _field$value4, _field$value4$indexOf;
     var form = field === null || field === void 0 ? void 0 : field.form;
     // 只有用「选项映射」格式化器的列（Select 一族，或登记为同一格式化器的组件）才需要运行时选项
     if (!form || !dataKey || isBlank(liveValue) || formatter !== getReadOnlyFormatter('Select')) return undefined;
-    var index = (_field$value$indexOf4 = field === null || field === void 0 || (_field$value4 = field.value) === null || _field$value4 === void 0 || (_field$value4$indexOf = _field$value4.indexOf) === null || _field$value4$indexOf === void 0 ? void 0 : _field$value4$indexOf.call(_field$value4, record)) !== null && _field$value$indexOf4 !== void 0 ? _field$value$indexOf4 : -1;
+    var _resolveCellRow2 = resolveCellRow(field, record, node, dataSource),
+      index = _resolveCellRow2.index;
     if (index < 0) return undefined;
     var own = untracked(function () {
       return form.query(field.path.concat(index).concat(dataKey)).take();
@@ -462,14 +521,17 @@ var LazyAgField = function LazyAgField(params) {
   // 改值(行引用不变 → AG-Grid 不刷新该格、外层 observer 也不重渲)时,本格能自行重渲刷新——
   // 免去调用方加 forceAgField 逃生阀。字段名缺失才回退 params.value。@author nokecy
   return /*#__PURE__*/React.createElement(Observer, null, function () {
+    var _resolveCellRow3 = resolveCellRow(field, record, node, dataSource),
+      currentRecord = _resolveCellRow3.record;
+    if (!currentRecord) return /*#__PURE__*/React.createElement(React.Fragment, null);
     var activated = activeCells.has(key);
     // 已挂载时不读值:挂载后每敲一个字都会变,追踪它会让整棵字段树跟着重渲
-    var liveValue = activated ? undefined : dataKey != null && record ? readByFieldPath(record, dataKey) : value;
+    var liveValue = activated ? undefined : dataKey != null ? readByFieldPath(currentRecord, dataKey) : value;
     // Editable 装饰器会把非新增行的格转成只读态、不参与校验(见 editable/index.tsx),
     // 这时挂了没用,还会把灰色「请输入」占位换成只读态的「N/A」,所以留在文本态
-    var editableWillReadPretty = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-decorator']) === 'Editable' && (record === null || record === void 0 ? void 0 : record._isNew) !== true;
+    var editableWillReadPretty = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-decorator']) === 'Editable' && currentRecord._isNew !== true;
     if (!activated && required && !editableWillReadPretty && isBlank(liveValue)) {
-      var _pattern = resolveLazyCellPattern(field, record, dataKey, fieldSchema, scope);
+      var _pattern = resolveLazyCellPattern(field, currentRecord, dataKey, fieldSchema, scope);
       if (_pattern == null || _pattern === 'editable') {
         // 记进激活集合:用户填了第一个字后值不再为空,但格子仍在编辑,要挂到失焦为止
         activeCells.add(key);
@@ -481,7 +543,7 @@ var LazyAgField = function LazyAgField(params) {
         onLeave: handleLeave
       }, /*#__PURE__*/React.createElement(AgField, {
         value: value,
-        data: record,
+        data: currentRecord,
         dataSource: dataSource,
         schema: schema,
         field: field,
@@ -496,7 +558,7 @@ var LazyAgField = function LazyAgField(params) {
     var text = formatter ? formatter(liveValue, ctx) : liveValue == null ? '' : String(liveValue);
     // 纯文本占满单元格,点击交给 AG-Grid onCellClicked 激活;样式尽量贴近 Editable 只读态避免点开跳动
     // 只读态(readPretty/disabled/readOnly)的空格不出编辑提示,留空与只读快路径一致
-    var pattern = text === '' ? resolveLazyCellPattern(field, record, dataKey, fieldSchema, scope) : undefined;
+    var pattern = text === '' ? resolveLazyCellPattern(field, currentRecord, dataKey, fieldSchema, scope) : undefined;
     if (text === '' && (pattern == null || pattern === 'editable')) {
       // 空值:出淡灰 placeholder,让用户看得出这格能填(颜色取 antd 输入框 placeholder 的 token,自动跟随暗色主题)
       return /*#__PURE__*/React.createElement("span", {
@@ -536,6 +598,8 @@ var LazyReadOnlyText = function LazyReadOnlyText(params) {
   var _fieldSchema$name2;
   var value = params.value,
     record = params.data,
+    field = params.field,
+    node = params.node,
     colDef = params.colDef,
     formatter = params.formatter,
     renderer = params.renderer,
@@ -543,7 +607,8 @@ var LazyReadOnlyText = function LazyReadOnlyText(params) {
     fieldSchema = params.fieldSchema;
   var dataKey = (_fieldSchema$name2 = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.name) !== null && _fieldSchema$name2 !== void 0 ? _fieldSchema$name2 : colDef === null || colDef === void 0 ? void 0 : colDef.field;
   return /*#__PURE__*/React.createElement(Observer, null, function () {
-    var liveValue = dataKey != null && record ? readByFieldPath(record, dataKey) : value;
+    var currentRecord = resolveCellRow(field, record, node).record;
+    var liveValue = dataKey != null && currentRecord ? readByFieldPath(currentRecord, dataKey) : value;
     var text = formatter ? formatter(liveValue, {
       columnProps: columnProps,
       fieldSchema: fieldSchema
@@ -631,12 +696,13 @@ var applyNumberInputDefaults = function applyNumberInputDefaults(dataField) {
 // 重命名自 useArrayTableColumns:内部无任何 Hook 调用,use 前缀违反 Hook 命名约定且曾在 useMemo 内被调用 @author nokecy
 var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field, sources) {
   var arrayPattern = field === null || field === void 0 ? void 0 : field.pattern;
-  return sources.reduce(function (buf, _ref6, key) {
-    var _getReadOnlyFormatter;
-    var name = _ref6.name,
-      columnProps = _ref6.columnProps,
-      schema = _ref6.schema,
-      display = _ref6.display;
+  return sources.reduce(function (buf, _ref7, key) {
+    var _ref8, _getReadOnlyFormatter, _dataField$xComponen, _dataField$xComponen2;
+    var name = _ref7.name,
+      columnProps = _ref7.columnProps,
+      schema = _ref7.schema,
+      display = _ref7.display,
+      components = _ref7.components;
     if (display && display !== 'visible') return buf;
     if (!isColumnComponent(schema)) return buf;
 
@@ -680,7 +746,15 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
     // 只读列不兜底:自定义只读组件常显示别的字段(如 SiblingText),按自身值出文本会错。@author nokecy
     // 登记了只读渲染器的组件只读列也走快路径(渲染器出内容,兜底格式化器只用于判空)。@author nokecy
     var renderer = getReadOnlyRenderer(component);
-    var formatter = (_getReadOnlyFormatter = getReadOnlyFormatter(component)) !== null && _getReadOnlyFormatter !== void 0 ? _getReadOnlyFormatter : (!readOnly || renderer) && component && (dataField === null || dataField === void 0 ? void 0 : dataField.type) !== 'void' ? fallbackFormatter : null;
+    var formatter = (_ref8 = (_getReadOnlyFormatter = getReadOnlyFormatter(component, components)) !== null && _getReadOnlyFormatter !== void 0 ? _getReadOnlyFormatter : (dataField === null || dataField === void 0 || (_dataField$xComponen = dataField['x-component-props']) === null || _dataField$xComponen === void 0 ? void 0 : _dataField$xComponen.displayField) === 'value' ? fallbackFormatter : null) !== null && _ref8 !== void 0 ? _ref8 : (!readOnly || renderer) && component && (dataField === null || dataField === void 0 ? void 0 : dataField.type) !== 'void' ? fallbackFormatter : null;
+    var displayColumnProps = formatter && (getReadOnlyFormatter(component, components) !== getReadOnlyFormatter(component) || (dataField === null || dataField === void 0 || (_dataField$xComponen2 = dataField['x-component-props']) === null || _dataField$xComponen2 === void 0 ? void 0 : _dataField$xComponen2.displayField) === 'value') ? {
+      valueFormatter: function valueFormatter(params) {
+        return formatter(params.value, {
+          columnProps: columnProps,
+          fieldSchema: dataField
+        });
+      }
+    } : {};
     var hasReactions = !!(dataField && dataField['x-reactions']);
     if (!readOnly) applyNumberInputDefaults(dataField);
     var forceEager = (columnProps === null || columnProps === void 0 ? void 0 : columnProps.forceAgField) === true;
@@ -697,9 +771,11 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
     // 两者不一致时 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 valueGetter = !columnProps.valueGetter && dataFieldName && dataFieldName !== name ? function (params) {
       return readByFieldPath(params === null || params === void 0 ? void 0 : params.data, dataFieldName);
     } : undefined;
+    // 选择器解构值仍交给渲染器；排序单独提取展示字段，不能把整对象当成相等的文本。@author nokecy
+    if ((!dataField || dataField.type === 'void') && !columnProps.valueGetter && columnProps.sortable == null) base.sortable = false;else if (dataField && !base.comparator) base.comparator = createArrayTableComparator(dataField, columnProps, formatter);
     // 字段名是路径:`item.qty` 的值在 record.item.qty。快路径自己解析点号分段与对象解构(`{value:a,label:b}`);
     // 数组解构/下标等其余语法解析不了,回退全树交给 Formily。@author nokecy
     var canFastPath = !dataFieldName || isFastPathFieldName(dataFieldName);
@@ -715,6 +791,7 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
         } : {}), {}, {
           cellRenderer: LazyReadOnlyText,
           cellRendererParams: {
+            field: field,
             formatter: formatter,
             renderer: renderer,
             columnProps: columnProps,
@@ -775,11 +852,13 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
           // 必填、或带校验规则且为空的格必须挂真控件，否则没有字段节点，提交时没人校验它，见 LazyAgField
           required: isRequiredSchema(dataField) || hasValidatorRule(dataField)
         }
-      }));
+      }, displayColumnProps));
     }
 
     // ③ 兜底全树
-    return emit(_objectSpread(_objectSpread({}, base), {}, {
+    return emit(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+      valueGetter: valueGetter
+    } : {}), displayColumnProps), {}, {
       cellRendererParams: {
         dataSource: dataSource,
         schema: schema,
@@ -822,9 +901,9 @@ export var collectLazyDefaults = function collectLazyDefaults(columns) {
       key: String((_fieldSchema$name3 = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.name) !== null && _fieldSchema$name3 !== void 0 ? _fieldSchema$name3 : col.field),
       value: fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.default
     };
-  }).filter(function (_ref7) {
-    var key = _ref7.key,
-      value = _ref7.value;
+  }).filter(function (_ref9) {
+    var key = _ref9.key,
+      value = _ref9.value;
     return SIMPLE_FIELD_NAME.test(key) && value !== undefined && value !== null && !(typeof value === 'string' && value.includes('{{'));
   });
 };
@@ -843,9 +922,9 @@ export var applyLazyDefaults = function applyLazyDefaults(arrayField, defaults,
     // 已落库的行（带 id）保持库里的样子：补默认值会让受控字段凭空出现「变更」，
     // 已审批的数据保存时还会被要求填变更原因。只补新增行（按钮之外的途径推进来的行）。
     if (row.id != null || row._id != null) return;
-    defaults.forEach(function (_ref8) {
-      var key = _ref8.key,
-        value = _ref8.value;
+    defaults.forEach(function (_ref10) {
+      var key = _ref10.key,
+        value = _ref10.value;
       if (row[key] == null) {
         form.setValuesIn(arrayField.path.concat(index).concat(key), _typeof(value) === 'object' ? JSON.parse(JSON.stringify(value)) : value);
       }