@nokecy/qc-ui 1.1.50 → 1.1.52

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

@@ -203,4 +203,19 @@ export var useRowDrag = function useRowDrag(field) {
   return {
     handleRowDragMove: handleRowDragMove
   };
+};
+
+/**
+ * AG-Grid 的 suppressKeyboardEvent:单元格里的输入框按 Ctrl/Cmd+A 时,让浏览器自己全选文字。
+ *
+ * AG-Grid 把 Ctrl+A 当成「选中所有单元格」并 preventDefault,输入框(文本框、数字框都一样)
+ * 就选不中里面的文字。这里只放行这一个组合;方向键等其余按键仍归 handleCellKeyDown 做单元格导航。
+ * 复制/粘贴/剪切/撤销 AG-Grid 本来就没拦,不必处理。@author nokecy
+ */
+export var suppressSelectAllInInput = function suppressSelectAllInInput(_ref) {
+  var _target$matches;
+  var event = _ref.event;
+  if (!(event.ctrlKey || event.metaKey) || event.key.toLowerCase() !== 'a') return false;
+  var target = event.target;
+  return !!(target !== null && target !== void 0 && (_target$matches = target.matches) !== null && _target$matches !== void 0 && _target$matches.call(target, 'input, textarea, [contenteditable="true"]'));
 };

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

@@ -18,7 +18,8 @@ import { useFieldSchema } from "@formily/react";
 import { connect, mapProps, mapReadPretty } from "@formily/react";
 import uniqueId from "lodash/uniqueId";
 import { useAddition, buildArrayTableColumns, useArrayTableSources, useArrayTableActions, isColumnComponent } from "./utils";
-import { useCellFocus, useKeyboardNavigation, useRowDrag } from "./hooks";
+import { groupColumnDefs } from "./columnGroup";
+import { useCellFocus, useKeyboardNavigation, useRowDrag, suppressSelectAllInInput } from "./hooks";
 import ArrayBase from "./arrayBase";
 import ArrayAddBtn from "./arrayAddBtn";
 import PreviewArrayTable from "./preview";
@@ -57,7 +58,8 @@ var ArrayTableInner = observer(function (props) {
     isAdd = _useState2[0],
     setIsAdd = _useState2[1];
   var apiRef = useRef();
-  // 懒挂载激活态:存放已激活(点击/导航进过)的单元格 key(`rowId:colId`),供 LazyAgField 经 context 读取。@author nokecy
+  // 懒挂载激活态:存放当前挂着真控件的单元格 key(`rowId:colId`),供 LazyAgField 经 context 读写:
+  // 点击/导航进来时这里写入,必填且为空的格自己写入,焦点离开且校验通过后自己删除。@author nokecy
   var activeCellsRef = useRef(new Set());
   // 无 _id/id 的外部数据按对象引用分配稳定 rowId(避免 getRowId 返回 undefined)。@author nokecy
   var rowIdMapRef = useRef(new WeakMap());
@@ -78,14 +80,16 @@ var ArrayTableInner = observer(function (props) {
   // 通过 JSON.stringify 比较内容，只有内容真正变化时才返回新引用
   var sourcesKey = useMemo(function () {
     return JSON.stringify(rawSources.map(function (s) {
-      var _s$columnProps$header, _s$columnProps, _s$columnProps2;
+      var _s$columnProps$header, _s$columnProps, _s$columnProps2, _s$columnProps3;
       return {
         name: s.name,
         display: s.display,
         // 列标题可由 reactions 运行时改写,纳入 key 才能让 stableColumnDefs 跟着重建。
         // 宽度/隐藏/固定由 applyColumnState(方案)管,故意不纳入,避免行编辑时列状态被重置。
         // 可编辑性:带 x-reactions 的列在 buildArrayTableColumns 里已强制走 AgField 全树(尊重运行时 pattern),无需进 key。@author nokecy
-        headerName: (_s$columnProps$header = (_s$columnProps = s.columnProps) === null || _s$columnProps === void 0 ? void 0 : _s$columnProps.headerName) !== null && _s$columnProps$header !== void 0 ? _s$columnProps$header : (_s$columnProps2 = s.columnProps) === null || _s$columnProps2 === void 0 ? void 0 : _s$columnProps2.title
+        headerName: (_s$columnProps$header = (_s$columnProps = s.columnProps) === null || _s$columnProps === void 0 ? void 0 : _s$columnProps.headerName) !== null && _s$columnProps$header !== void 0 ? _s$columnProps$header : (_s$columnProps2 = s.columnProps) === null || _s$columnProps2 === void 0 ? void 0 : _s$columnProps2.title,
+        // 分组名变了列组结构就变,同样要重建。@author nokecy
+        headerGroup: (_s$columnProps3 = s.columnProps) === null || _s$columnProps3 === void 0 ? void 0 : _s$columnProps3.headerGroup
       };
     }));
   }, [rawSources]);
@@ -146,6 +150,12 @@ var ArrayTableInner = observer(function (props) {
     return cols;
   }, [sources, props.onRowDrag]); // 移除 field 依赖，避免数据变化时重新计算
 
+  // 交给 AgGridReact 的列定义:按 x-component-props.headerGroup 把相邻同组的列合并成列组(多级表头)。
+  // stableColumnDefs 保持扁平,懒列识别、列方案还原等内部逻辑仍用它;只有喂给 AG-Grid 的这一份带分组。@author nokecy
+  var gridColumnDefs = useMemo(function () {
+    return groupColumnDefs(stableColumnDefs);
+  }, [stableColumnDefs]);
+
   // 懒挂载:把激活态 Set 通过 AG-Grid context 暴露给 LazyAgField(引用稳定,原地 mutate)。@author nokecy
   var gridContext = useMemo(function () {
     return {
@@ -165,15 +175,15 @@ var ArrayTableInner = observer(function (props) {
 
   /**
    * 激活某个懒挂载单元格:加入激活集合并强制重渲该格 -> LazyAgField 改挂 AgField 全树。
-   * 返回 true 表示「本次新激活」(调用方需等挂载完成再聚焦);false 表示无需激活(非懒列/新增行/已激活)。@author nokecy
+   * 焦点离开后 LazyAgField 自己把它从集合里移除并卸回文本(见 utils.tsx)。
+   * 返回 true 表示「本次新激活」(调用方需等挂载完成再聚焦);false 表示无需激活(非懒列/已挂载着,
+   * 如必填且为空的格本就挂着)。新增行的格与存量行一视同仁:非必填的也是先文本、点了才挂。@author nokecy
    */
   var activateCell = useCallback(function (api, node, colId) {
-    var _node$data;
     if (!api || !node || !colId) return false;
     if (!lazyColIds.has(colId)) return false; // 非懒列(已是 AgField/纯文本)
-    if ((_node$data = node.data) !== null && _node$data !== void 0 && _node$data._isNew) return false; // 新增行本就 eager 挂着
     var key = "".concat(node.id, ":").concat(colId);
-    if (activeCellsRef.current.has(key)) return false; // 已激活
+    if (activeCellsRef.current.has(key)) return false; // 已挂载
     activeCellsRef.current.add(key);
     api.refreshCells({
       rowNodes: [node],
@@ -222,8 +232,8 @@ var ArrayTableInner = observer(function (props) {
       if (hasGroups) {
         // 传入 stableColumnDefs 作为原始定义,保留 cellRenderer(AgField/LazyAgField)及其
         // cellRendererParams——否则分组方案重建出的是裸列,单元格退化为纯文本、编辑失效。@author nokecy
-        var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig, stableColumnDefs);
-        gridApiState.setGridOption('columnDefs', gridColumnDefs);
+        var _gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig, stableColumnDefs);
+        gridApiState.setGridOption('columnDefs', _gridColumnDefs);
       }
 
       // 2. 应用列状态（列顺序、宽度、隐藏、固定等）
@@ -378,6 +388,8 @@ var ArrayTableInner = observer(function (props) {
     enableCellTextSelection: true,
     defaultColDef: {
       resizable: true,
+      // 输入框里的 Ctrl/Cmd+A 交给浏览器全选文字,不让 AG-Grid 当成「选中所有单元格」拦走
+      suppressKeyboardEvent: suppressSelectAllInInput,
       headerComponentParams: {
         template: '<div class="ag-cell-label-container" role="presentation">' +
         // '  <span data-ref="eMenu" class="ag-header-icon ag-header-cell-menu-button" aria-hidden="true"></span>' +
@@ -416,7 +428,7 @@ var ArrayTableInner = observer(function (props) {
     ,
     rowHeight: 38,
     pagination: false,
-    columnDefs: stableColumnDefs,
+    columnDefs: gridColumnDefs,
     rowData: dataSource
   })), sources.map(function (column, key) {
     //专门用来承接对Column的状态管理

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

@@ -3,9 +3,28 @@ import { FieldDisplayTypes, GeneralField } from "@formily/core";
 import { Schema } from "@formily/json-schema";
 import { AgGridReactProps } from "ag-grid-react";
 import React from "react";
+/**
+ * ArrayTable.Column 的 x-component-props 里 qc-ui 自己认的扩展属性;
+ * 其余属性(width、headerName、pinned 等)按 AG-Grid 列定义处理。
+ *
+ * @author nokecy
+ */
+interface ArrayTableColumnProps {
+    /**
+     * 表头分组名(多级表头,仅一级)。
+     * 相邻且 headerGroup 相同的列合并成一个列组,分组名作为组头;
+     * 同名但不相邻的列各自成组;不写则该列不分组。
+     */
+    headerGroup?: string;
+    /**
+     * 默认隐藏:为 true 时该列首次出现时是隐藏的,用户可在列设置里打开,列方案(applyColumnState)优先。
+     * 对应 AG-Grid 的 initialHide。注意 hide 在 ArrayTable 里不生效(状态归列方案管),要默认隐藏请用它。
+     */
+    defaultHide?: boolean;
+}
 interface ObservableColumnSource {
     field: GeneralField;
-    columnProps: any;
+    columnProps: ArrayTableColumnProps & Record<string, any>;
     schema: Schema;
     display: FieldDisplayTypes;
     name: string;
@@ -13,4 +32,4 @@ interface ObservableColumnSource {
 type ComposedArrayTable = React.FC<React.PropsWithChildren<AgGridReactProps>> & ArrayBaseMixins & {
     Column?: any;
 };
-export { ComposedArrayTable, ObservableColumnSource };
+export { ComposedArrayTable, ObservableColumnSource, ArrayTableColumnProps };

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

@@ -1,18 +1,3 @@
-/**
- * 只读列「纯文本快路径」格式化器注册表
- *
- * 背景:ArrayTable 每个可见单元格默认挂一棵完整 Formily 字段树(AgField),
- * 行虚拟化滚动时整行销毁重建,列多必然掉帧。只读列没有编辑/校验/写回,
- * 完全可以不挂 Formily 树、改用 AG-Grid 的 valueFormatter 出纯文本。
- *
- * 本注册表负责「内层组件类型 -> 显示文本」的映射。命中返回格式化器,
- * 未命中返回 null —— 调用方据此安全回退 AgField(正确优先于速度)。
- *
- * 取舍:这是 Formily readPretty 之外的一份精简显示逻辑,可能与定制 readPretty
- * 发散。靠「未命中即回退 + 消费方可 registerReadOnlyFormatter 扩展」控制风险。
- *
- * @author nokecy
- */
 export type ReadOnlyFormatterCtx = {
     /** 列的 x-component-props(headerName/width/options/format 等) */
     columnProps: any;

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

@@ -14,7 +14,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
  *
  * @author nokecy
  */
-
+import dayjs from 'dayjs';
 /** 从字段 schema / 列 props 里尽量取到 Select 的可选项(value->label 映射用) */
 var resolveOptions = function resolveOptions(ctx) {
   var _ref, _ref2, _ref3, _fieldSchema$enum, _fieldSchema$xCompon, _fieldSchema$xCompon2;
@@ -56,9 +56,11 @@ var dateFormatter = function dateFormatter(value, ctx) {
   var _ref6, _ctx$columnProps$form, _ctx$columnProps, _ctx$fieldSchema;
   if (value == null || value === '') return '';
   var fmt = (_ref6 = (_ctx$columnProps$form = (_ctx$columnProps = ctx.columnProps) === null || _ctx$columnProps === void 0 ? void 0 : _ctx$columnProps.format) !== null && _ctx$columnProps$form !== void 0 ? _ctx$columnProps$form : (_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.format) !== null && _ref6 !== void 0 ? _ref6 : 'YYYY-MM-DD';
-  // 值多为 dayjs 对象(有 .format)或已格式化的字符串;不强引 dayjs,保持轻量
-  if (value && typeof value.format === 'function') return value.format(fmt);
-  return String(value);
+  if (typeof value.format === 'function') return value.format(fmt);
+  // 后端回来的多是 ISO 串(2024-10-19T00:00:00)或时间戳:与 Formily readPretty 一致,按 dayjs(value).format(fmt) 显示;
+  // 解析不了的文本(如「待定」)原样显示,不吞掉。dayjs 随 antd 传递依赖引入,本库其他模块已直接使用。
+  var parsed = dayjs(value);
+  return parsed.isValid() ? parsed.format(fmt) : String(value);
 };
 var booleanFormatter = function booleanFormatter(value, ctx) {
   var _ctx$fieldSchema$xCo, _ctx$fieldSchema2, _props$checkedChildre, _props$unCheckedChild;

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

@@ -10,14 +10,21 @@ declare const useArrayTableActions: () => ObservableColumnSource[];
  * 懒挂载单元格渲染器(可编辑列)。
  *
  * 已有行的可编辑格被 Editable 装饰器默认转成 readPretty 只读文本态(点击才进编辑),
- * 但仍挂着完整 Formily 树——这是行多列多滚动卡的主因。本渲染器:
- *  - 新增行(_isNew,保持编辑态需即时校验) 或 已被激活(点击/导航进过)的格 -> 挂 AgField 全树;
- *  - 其余(存量行、没碰过) -> 只渲染廉价纯文本(复用 readOnlyFormatters),不挂 Formily 树。
+ * 但仍挂着完整 Formily 树——这是行多列多滚动卡的主因。本渲染器让每个格在两种形态间切换:
+ *  - 懒挂载文本:只渲染廉价纯文本(复用 readOnlyFormatters),不挂 Formily 树。默认形态。
+ *  - 挂载态:挂 AgField 全树,可编辑、可校验。
  *
- * 激活态存放在 AG-Grid context.activeCells(Set),由 index.tsx 在点击/键盘导航时写入并 refreshCells。
- * 「挂了不卸」:一旦激活保持挂载(直到行被虚拟化销毁),不做失焦退回,避开一堆边界。
+ * 何时挂载:
+ *  1. 被激活(点击/键盘导航进来):激活态存放在 AG-Grid context.activeCells(Set),
+ *     由 index.tsx 写入并 refreshCells;
+ *  2. 必填且为空:空的必填格必须是真控件,否则没有字段节点,提交时没人校验它。
+ *     不区分新增行、存量行、initialValues 带进来的行——只看「必填且空」。
+ *     例外:Editable 装饰器的非新增行,Editable 自己会把它转成只读态,挂了也不校验,留在文本态。
+ * 何时卸回文本:焦点离开本格,且该字段校验通过(必填的已填上、没有格式错误)。
+ *  必填仍为空或校验有错则留着控件,让用户看见错误——与 Editable 失焦时的判断一致。
+ *  卸掉的只是渲染树,Formily 字段节点与值都还在,再次点击会接着用。
  *
- * 校验安全:未碰过的存量格本就是 readPretty、本就不参与校验,不挂树校验语义零变化。@author nokecy
+ * 校验安全:空的必填格不会卸成文本(见上);其余格卸载前已校验通过。@author nokecy
  */
 declare const LazyAgField: (params: any) => React.JSX.Element;
 /**

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

@@ -1,19 +1,30 @@
-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); }
-var _excluded = ["hide", "sort", "sortIndex", "forceAgField"];
+var _excluded = ["hide", "sort", "sortIndex", "forceAgField", "headerGroup", "defaultHide"];
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React from 'react';
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import React, { useReducer, useRef } from 'react';
 import { theme } from 'antd';
 import { useField, useFieldSchema, RecursionField, Observer, useExpressionScope } from '@formily/react';
 import { isArr, lazyMerge } from '@formily/shared';
 import { Schema } from '@formily/json-schema';
 import ArrayBase from "./arrayBase";
 import { getReadOnlyFormatter } from "./readOnlyFormatters";
+import { markHeaderGroup } from "./columnGroup";
+import { CellFocusScope } from "./cellFocusScope";
 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;
@@ -205,10 +216,12 @@ var resolveLazyCellPattern = function resolveLazyCellPattern(arrayField, record,
   try {
     var _arrayField$value$ind, _arrayField$value, _arrayField$value$ind2;
     var index = (_arrayField$value$ind = (_arrayField$value = arrayField.value) === null || _arrayField$value === void 0 || (_arrayField$value$ind2 = _arrayField$value.indexOf) === null || _arrayField$value$ind2 === void 0 ? void 0 : _arrayField$value$ind2.call(_arrayField$value, record)) !== null && _arrayField$value$ind !== void 0 ? _arrayField$value$ind : -1;
-    var path = arrayField.address.concat(index).concat(dataKey);
+    // 与真字段一致:path 是数据路径(不含 void 容器),address 含 void 容器;表达式里 getValuesIn($self.path...) 靠前者
+    var path = arrayField.path.concat(index).concat(dataKey);
+    var address = arrayField.address.concat(index).concat(dataKey);
     var self = {
       path: path,
-      address: path,
+      address: address,
       index: index,
       form: form,
       parent: arrayField,
@@ -232,21 +245,60 @@ var resolveLazyCellPattern = function resolveLazyCellPattern(arrayField, record,
   }
 };
 
+/**
+ * 值算不算「没填」:null/undefined/空串,或成员全是这类值的数组/对象(如 labelInValue 的
+ * {value:undefined,label:undefined})。0 和 false 是有效值,不算空。@author nokecy
+ */
+var isBlank = function isBlank(value) {
+  if (value == null || value === '') return true;
+  if (Array.isArray(value)) return value.every(isBlank);
+  if (Object.prototype.toString.call(value) === '[object Object]') return Object.values(value).every(isBlank);
+  return false;
+};
+var hasRequiredRule = function hasRequiredRule(rule) {
+  if (rule == null) return false;
+  if (rule === 'required') return true;
+  if (Array.isArray(rule)) return rule.some(hasRequiredRule);
+  if (_typeof(rule) === 'object') return rule.required != null && rule.required !== false;
+  return false;
+};
+
+/**
+ * 数据字段是否必填(静态判定):字段上写了 required,或 x-validator 里带 required 规则。
+ *
+ * 判不准(required 写成表达式串)时按必填算:误判必填只是多挂一个控件,
+ * 误判非必填会让空的必填格没人校验——与只读判定同样的安全不对称。
+ * 靠 x-reactions 动态改必填的列本就整列 eager,不走这里。@author nokecy
+ */
+var isRequiredSchema = function isRequiredSchema(fieldSchema) {
+  if (!fieldSchema) return false;
+  var required = fieldSchema.required;
+  if (required === true || typeof required === 'string') return true;
+  return hasRequiredRule(fieldSchema['x-validator']);
+};
+
 /**
  * 懒挂载单元格渲染器(可编辑列)。
  *
  * 已有行的可编辑格被 Editable 装饰器默认转成 readPretty 只读文本态(点击才进编辑),
- * 但仍挂着完整 Formily 树——这是行多列多滚动卡的主因。本渲染器:
- *  - 新增行(_isNew,保持编辑态需即时校验) 或 已被激活(点击/导航进过)的格 -> 挂 AgField 全树;
- *  - 其余(存量行、没碰过) -> 只渲染廉价纯文本(复用 readOnlyFormatters),不挂 Formily 树。
+ * 但仍挂着完整 Formily 树——这是行多列多滚动卡的主因。本渲染器让每个格在两种形态间切换:
+ *  - 懒挂载文本:只渲染廉价纯文本(复用 readOnlyFormatters),不挂 Formily 树。默认形态。
+ *  - 挂载态:挂 AgField 全树,可编辑、可校验。
  *
- * 激活态存放在 AG-Grid context.activeCells(Set),由 index.tsx 在点击/键盘导航时写入并 refreshCells。
- * 「挂了不卸」:一旦激活保持挂载(直到行被虚拟化销毁),不做失焦退回,避开一堆边界。
+ * 何时挂载:
+ *  1. 被激活(点击/键盘导航进来):激活态存放在 AG-Grid context.activeCells(Set),
+ *     由 index.tsx 写入并 refreshCells;
+ *  2. 必填且为空:空的必填格必须是真控件,否则没有字段节点,提交时没人校验它。
+ *     不区分新增行、存量行、initialValues 带进来的行——只看「必填且空」。
+ *     例外:Editable 装饰器的非新增行,Editable 自己会把它转成只读态,挂了也不校验,留在文本态。
+ * 何时卸回文本:焦点离开本格,且该字段校验通过(必填的已填上、没有格式错误)。
+ *  必填仍为空或校验有错则留着控件,让用户看见错误——与 Editable 失焦时的判断一致。
+ *  卸掉的只是渲染树,Formily 字段节点与值都还在,再次点击会接着用。
  *
- * 校验安全:未碰过的存量格本就是 readPretty、本就不参与校验,不挂树校验语义零变化。@author nokecy
+ * 校验安全:空的必填格不会卸成文本(见上);其余格卸载前已校验通过。@author nokecy
  */
 var LazyAgField = function LazyAgField(params) {
-  var _context$activeCells, _context$activeCells$, _fieldSchema$name;
+  var _context$activeCells, _fieldSchema$name;
   var value = params.value,
     record = params.data,
     dataSource = params.dataSource,
@@ -257,32 +309,105 @@ var LazyAgField = function LazyAgField(params) {
     context = params.context,
     formatter = params.formatter,
     columnProps = params.columnProps,
-    fieldSchema = params.fieldSchema;
+    fieldSchema = params.fieldSchema,
+    required = params.required;
   // hook 必须在下面的条件 return 之前调用
   var _theme$useToken = theme.useToken(),
     token = _theme$useToken.token;
   var scope = useExpressionScope();
+  var _useReducer = useReducer(function (n) {
+      return n + 1;
+    }, 0),
+    _useReducer2 = _slicedToArray(_useReducer, 2),
+    rerender = _useReducer2[1];
+  var localCells = useRef(new Set());
+  var activeCells = (_context$activeCells = context === null || context === void 0 ? void 0 : context.activeCells) !== null && _context$activeCells !== void 0 ? _context$activeCells : localCells.current;
   var key = "".concat(node === null || node === void 0 ? void 0 : node.id, ":").concat(colDef === null || colDef === void 0 ? void 0 : colDef.field);
-  var activated = (record === null || record === void 0 ? void 0 : record._isNew) === true || (context === null || context === void 0 || (_context$activeCells = context.activeCells) === null || _context$activeCells === void 0 || (_context$activeCells$ = _context$activeCells.has) === null || _context$activeCells$ === void 0 ? void 0 : _context$activeCells$.call(_context$activeCells, key)) === true;
-  if (activated) {
-    return /*#__PURE__*/React.createElement(AgField, {
-      value: value,
-      data: record,
-      dataSource: dataSource,
-      schema: schema,
-      field: field,
-      node: node
-    });
-  }
+  // 内层字段名:Column key 与它可能不一致(设计器形态),取值/找字段节点都按它
+  var dataKey = (_fieldSchema$name = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.name) !== null && _fieldSchema$name !== void 0 ? _fieldSchema$name : colDef === null || colDef === void 0 ? void 0 : colDef.field;
 
-  // Observer 包裹纯文本:让未激活的廉价文本格反应式跟随内层 Formily 字段值。
+  /** 焦点离开本格:校验通过才卸回懒挂载文本。isStale 为真说明校验期间焦点又回来了或格子已销毁 */
+  var handleLeave = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(isStale) {
+      var _field$value$indexOf3, _field$value3, _field$value3$indexOf, _field$form;
+      var index, cellField;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            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 容器);从没挂载过就没有节点,无需校验
+            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 = 11;
+              break;
+            }
+            _context.prev = 3;
+            _context.next = 6;
+            return cellField.validate();
+          case 6:
+            _context.next = 11;
+            break;
+          case 8:
+            _context.prev = 8;
+            _context.t0 = _context["catch"](3);
+            return _context.abrupt("return");
+          case 11:
+            if (!isStale()) {
+              _context.next = 13;
+              break;
+            }
+            return _context.abrupt("return");
+          case 13:
+            if (!(required && isBlank(dataKey != null ? readByFieldPath(record, dataKey) : undefined))) {
+              _context.next = 15;
+              break;
+            }
+            return _context.abrupt("return");
+          case 15:
+            activeCells.delete(key);
+            rerender();
+          case 17:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[3, 8]]);
+    }));
+    return function handleLeave(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+
+  // Observer 让本格反应式跟随内层 Formily 字段值。
   // record 即 field.value[index] 的可观察对象;在 Observer 里按内层字段名直接读 record[dataKey]
   // (而非 AG-Grid 渲染时快照的 params.value)建立依赖后,onFieldValueChange/setValuesIn 程序化原地
   // 改值(行引用不变 → AG-Grid 不刷新该格、外层 observer 也不重渲)时,本格能自行重渲刷新——
   // 免去调用方加 forceAgField 逃生阀。字段名缺失才回退 params.value。@author nokecy
-  var dataKey = (_fieldSchema$name = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.name) !== null && _fieldSchema$name !== void 0 ? _fieldSchema$name : 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 activated = activeCells.has(key);
+    // 已挂载时不读值:挂载后每敲一个字都会变,追踪它会让整棵字段树跟着重渲
+    var liveValue = activated ? undefined : dataKey != null && record ? readByFieldPath(record, 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;
+    if (!activated && required && !editableWillReadPretty && isBlank(liveValue)) {
+      var _pattern = resolveLazyCellPattern(field, record, dataKey, fieldSchema, scope);
+      if (_pattern == null || _pattern === 'editable') {
+        // 记进激活集合:用户填了第一个字后值不再为空,但格子仍在编辑,要挂到失焦为止
+        activeCells.add(key);
+        activated = true;
+      }
+    }
+    if (activated) {
+      return /*#__PURE__*/React.createElement(CellFocusScope, {
+        onLeave: handleLeave
+      }, /*#__PURE__*/React.createElement(AgField, {
+        value: value,
+        data: record,
+        dataSource: dataSource,
+        schema: schema,
+        field: field,
+        node: node
+      }));
+    }
     var text = formatter ? formatter(liveValue, {
       columnProps: columnProps,
       fieldSchema: fieldSchema
@@ -393,14 +518,35 @@ var isColumnReadOnlyEligible = function isColumnReadOnlyEligible(arrayPattern, d
   return false;
 };
 
+/** 明细单元格里的数字输入组件(antd InputNumber 及其 Formily 封装) */
+var NUMBER_INPUT_COMPONENTS = new Set(['NumberPicker', 'InputNumber']);
+
+/**
+ * 明细单元格里的数字输入默认去掉上下步进:不显示上下按钮、不响应方向键步进。
+ *
+ * 上下按钮会压住右对齐数字的末尾;方向键步进则与单元格间的方向键导航冲突——
+ * 在数字格里按 ↑/↓,导航到别的格的同时,被离开的那格数值也被悄悄 +1/-1。
+ * 字段的 x-component-props 里显式写了 controls/keyboard 的以使用方为准。
+ * 只对会挂真控件的列调用(只读快路径没有输入框)。幂等。@author nokecy
+ */
+var applyNumberInputDefaults = function applyNumberInputDefaults(dataField) {
+  if (!dataField || !NUMBER_INPUT_COMPONENTS.has(dataField['x-component'])) return;
+  var props = dataField['x-component-props'];
+  if (props != null && _typeof(props) !== 'object') return; // 整个 props 写成了表达式串,不动
+  dataField['x-component-props'] = _objectSpread({
+    controls: false,
+    keyboard: false
+  }, props);
+};
+
 // 重命名自 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, _ref3, key) {
-    var name = _ref3.name,
-      columnProps = _ref3.columnProps,
-      schema = _ref3.schema,
-      display = _ref3.display;
+  return sources.reduce(function (buf, _ref4, key) {
+    var name = _ref4.name,
+      columnProps = _ref4.columnProps,
+      schema = _ref4.schema,
+      display = _ref4.display;
     if (display && display !== 'visible') return buf;
     if (!isColumnComponent(schema)) return buf;
 
@@ -413,6 +559,8 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
       sort = columnProps.sort,
       sortIndex = columnProps.sortIndex,
       forceAgField = columnProps.forceAgField,
+      headerGroup = columnProps.headerGroup,
+      defaultHide = columnProps.defaultHide,
       safeColumnProps = _objectWithoutProperties(columnProps, _excluded);
     var base = _objectSpread(_objectSpread({}, safeColumnProps), {}, {
       // 保留 width 作为列的初始宽度
@@ -420,18 +568,27 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
       //@ts-ignore
       headerName: columnProps.headerName || columnProps.title,
       field: name
-    });
+    }, defaultHide === true ? {
+      initialHide: true
+    } : {});
+
+    // 记下分组名再输出列定义;真正合并成列组在 index.tsx 交给 AG-Grid 之前(groupColumnDefs)做,
+    // 这里产出的仍是扁平列定义。@author nokecy
+    var emit = function emit(colDef) {
+      return buf.concat(markHeaderGroup(colDef, headerGroup));
+    };
 
     // 三分流渲染策略:@author nokecy
     //   ① 只读纯文本(永不可编辑):只读列 + 有格式化器 -> valueFormatter,不挂 Formily 树。
     //   ② 可编辑懒挂载:可编辑列 + 有格式化器 + 无 reactions + 未强制 eager -> LazyAgField,
-    //      存量格先出廉价文本、点击/导航才挂全树(挂了不卸)。
+    //      格子先出廉价文本、点击/导航(或必填且为空)才挂全树,焦点离开且校验通过再卸回文本。
     //   ③ 兜底全树:其余(无格式化器/带 reactions/forceAgField/复杂字段名/只读但无格式化器) -> AgField。
     var dataField = findDataFieldSchema(schema, name);
     var component = dataField === null || dataField === void 0 ? void 0 : dataField['x-component'];
     var formatter = getReadOnlyFormatter(component);
     var readOnly = isColumnReadOnlyEligible(arrayPattern, dataField, columnProps);
     var hasReactions = !!(dataField && dataField['x-reactions']);
+    if (!readOnly) applyNumberInputDefaults(dataField);
     var forceEager = (columnProps === null || columnProps === void 0 ? void 0 : columnProps.forceAgField) === true;
     // Switch/Checkbox 是「单击直控」组件:可编辑态本就该常驻渲染真控件(优化前即如此)。
     // 懒挂载会把它降成「是/否」纯文本(点击才挂出开关),用户会以为开关消失。故可编辑态强制 eager。
@@ -456,7 +613,7 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
       // 读 AG-Grid 缓存值不刷新 → 反应式只读渲染。整表 readPretty(明细/详情页,数据 setValues 整体加载、
       // 行引用整体替换、AG-Grid 自然刷新)仍走更廉价的静态 valueFormatter 快路径。@author nokecy
       if (arrayPattern !== 'readPretty') {
-        return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+        return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
           valueGetter: valueGetter
         } : {}), {}, {
           cellRenderer: LazyReadOnlyText,
@@ -467,7 +624,7 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
           }
         }));
       }
-      return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+      return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
         valueGetter: valueGetter
       } : {}), {}, {
         // 显式清掉可能从 safeColumnProps 漏带的 cellRenderer(AG-Grid 中 renderer 优先级高于 formatter)
@@ -483,7 +640,7 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
 
     // ② 可编辑懒挂载(排除单击直控的 Switch/Checkbox:须 eager 出真控件)
     if (!readOnly && formatter && !hasReactions && !forceEager && !isInlineToggle && canFastPath) {
-      return buf.concat(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
+      return emit(_objectSpread(_objectSpread(_objectSpread({}, base), valueGetter ? {
         valueGetter: valueGetter
       } : {}), {}, {
         cellRenderer: LazyAgField,
@@ -494,13 +651,15 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
           formatter: formatter,
           columnProps: columnProps,
           fieldSchema: dataField,
-          lazyEditable: true // 供 index.tsx 识别懒列(激活/导航用)
+          lazyEditable: true,
+          // 供 index.tsx 识别懒列(激活/导航用)
+          required: isRequiredSchema(dataField) // 必填且为空的格必须挂真控件,见 LazyAgField
         }
       }));
     }
 
     // ③ 兜底全树
-    return buf.concat(_objectSpread(_objectSpread({}, base), {}, {
+    return emit(_objectSpread(_objectSpread({}, base), {}, {
       cellRendererParams: {
         dataSource: dataSource,
         schema: schema,