@nokecy/qc-ui 1.1.86 → 1.1.88

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

@@ -14,6 +14,7 @@ var _arrayBase = _interopRequireDefault(require("./arrayBase"));
 var _readOnlyFormatters = require("./readOnlyFormatters");
 var _columnGroup = require("./columnGroup");
 var _cellFocusScope = require("./cellFocusScope");
+var _sorting = require("./sorting");
 var _excluded = ["hide", "sort", "sortIndex", "forceAgField", "headerGroup", "defaultHide"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
@@ -54,6 +55,7 @@ var isActionComponent = function isActionComponent(schema) {
 var useArrayTableSources = exports.useArrayTableSources = function useArrayTableSources() {
   var arrayField = (0, _react2.useField)();
   var schema = (0, _react2.useFieldSchema)();
+  var components = _react.default.useContext(_react2.SchemaComponentsContext);
   var parseSources = function parseSources(schema) {
     if (isColumnComponent(schema) || isOperationsComponent(schema) || isAdditionComponent(schema)) {
       var _schema$xComponentP, _schema$xComponentP2, _field$component;
@@ -69,7 +71,8 @@ var useArrayTableSources = exports.useArrayTableSources = function useArrayTable
         //@ts-ignore
         field: field,
         schema: schema,
-        columnProps: columnProps
+        columnProps: columnProps,
+        components: components
       }];
     } else if (schema.properties) {
       return schema.reduceProperties(function (buf, schema) {
@@ -125,19 +128,45 @@ var useArrayTableActions = exports.useArrayTableActions = function useArrayTable
   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
@@ -207,10 +236,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];
@@ -365,6 +394,7 @@ var LazyAgField = exports.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,
@@ -387,59 +417,88 @@ var LazyAgField = exports.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);
     };
   }();
 
@@ -452,11 +511,11 @@ var LazyAgField = exports.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 !== (0, _readOnlyFormatters.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 = (0, _reactive.untracked)(function () {
       return form.query(field.path.concat(index).concat(dataKey)).take();
@@ -471,14 +530,17 @@ var LazyAgField = exports.LazyAgField = function LazyAgField(params) {
   // 改值(行引用不变 → AG-Grid 不刷新该格、外层 observer 也不重渲)时,本格能自行重渲刷新——
   // 免去调用方加 forceAgField 逃生阀。字段名缺失才回退 params.value。@author nokecy
   return /*#__PURE__*/_react.default.createElement(_react2.Observer, null, function () {
+    var _resolveCellRow3 = resolveCellRow(field, record, node, dataSource),
+      currentRecord = _resolveCellRow3.record;
+    if (!currentRecord) return /*#__PURE__*/_react.default.createElement(_react.default.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);
@@ -490,7 +552,7 @@ var LazyAgField = exports.LazyAgField = function LazyAgField(params) {
         onLeave: handleLeave
       }, /*#__PURE__*/_react.default.createElement(AgField, {
         value: value,
-        data: record,
+        data: currentRecord,
         dataSource: dataSource,
         schema: schema,
         field: field,
@@ -505,7 +567,7 @@ var LazyAgField = exports.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.default.createElement("span", {
@@ -545,6 +607,8 @@ var LazyReadOnlyText = exports.LazyReadOnlyText = function LazyReadOnlyText(para
   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,
@@ -552,7 +616,8 @@ var LazyReadOnlyText = exports.LazyReadOnlyText = function LazyReadOnlyText(para
     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.default.createElement(_react2.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
@@ -640,12 +705,13 @@ var applyNumberInputDefaults = function applyNumberInputDefaults(dataField) {
 // 重命名自 useArrayTableColumns:内部无任何 Hook 调用,use 前缀违反 Hook 命名约定且曾在 useMemo 内被调用 @author nokecy
 var buildArrayTableColumns = exports.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;
 
@@ -689,7 +755,15 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
     // 只读列不兜底:自定义只读组件常显示别的字段(如 SiblingText),按自身值出文本会错。@author nokecy
     // 登记了只读渲染器的组件只读列也走快路径(渲染器出内容,兜底格式化器只用于判空)。@author nokecy
     var renderer = (0, _readOnlyFormatters.getReadOnlyRenderer)(component);
-    var formatter = (_getReadOnlyFormatter = (0, _readOnlyFormatters.getReadOnlyFormatter)(component)) !== null && _getReadOnlyFormatter !== void 0 ? _getReadOnlyFormatter : (!readOnly || renderer) && component && (dataField === null || dataField === void 0 ? void 0 : dataField.type) !== 'void' ? _readOnlyFormatters.fallbackFormatter : null;
+    var formatter = (_ref8 = (_getReadOnlyFormatter = (0, _readOnlyFormatters.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' ? _readOnlyFormatters.fallbackFormatter : null) !== null && _ref8 !== void 0 ? _ref8 : (!readOnly || renderer) && component && (dataField === null || dataField === void 0 ? void 0 : dataField.type) !== 'void' ? _readOnlyFormatters.fallbackFormatter : null;
+    var displayColumnProps = formatter && ((0, _readOnlyFormatters.getReadOnlyFormatter)(component, components) !== (0, _readOnlyFormatters.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;
@@ -706,9 +780,11 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
     // 两者不一致时 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 = (0, _sorting.createArrayTableComparator)(dataField, columnProps, formatter);
     // 字段名是路径:`item.qty` 的值在 record.item.qty。快路径自己解析点号分段与对象解构(`{value:a,label:b}`);
     // 数组解构/下标等其余语法解析不了,回退全树交给 Formily。@author nokecy
     var canFastPath = !dataFieldName || isFastPathFieldName(dataFieldName);
@@ -724,6 +800,7 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
         } : {}), {}, {
           cellRenderer: LazyReadOnlyText,
           cellRendererParams: {
+            field: field,
             formatter: formatter,
             renderer: renderer,
             columnProps: columnProps,
@@ -784,11 +861,13 @@ var buildArrayTableColumns = exports.buildArrayTableColumns = function buildArra
           // 必填、或带校验规则且为空的格必须挂真控件，否则没有字段节点，提交时没人校验它，见 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,
@@ -830,9 +909,9 @@ var collectLazyDefaults = exports.collectLazyDefaults = function collectLazyDefa
       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('{{'));
   });
 };
@@ -851,9 +930,9 @@ var applyLazyDefaults = exports.applyLazyDefaults = function applyLazyDefaults(a
     // 已落库的行（带 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);
       }

package/dist/cjs/dialogSelect/index.d.ts

@@ -2,10 +2,13 @@ import { SelectProps } from 'antd/lib/select';
 import React from 'react';
 import { ColDef, ColGroupDef } from 'ag-grid-community';
 import type { PagedApiAdapter } from '../adapters';
+import type { SelectDisplayField } from '../array-table/readOnlyFormatters';
 import './index.less';
 /** 选择窗口的行选择模式。 */
 type DialogSelectionMode = 'single' | 'multiple';
 interface IDialogSelectProps extends SelectProps<any> {
+    /** 回显编码或名称，保持原始 value/label 和联动回调不变。@author nokecy */
+    displayField?: SelectDisplayField;
     /** 隐藏选择窗口入口（输入框内的后缀图标），只保留输入与下拉。 */
     hideBtn?: boolean;
     request?: any;

package/dist/cjs/dialogSelect/index.js

@@ -15,9 +15,11 @@ var _draggableModal = _interopRequireDefault(require("../draggableModal"));
 var _adapters = require("../adapters");
 var _controls = require("../readPretty/controls");
 var _selectValue = require("../readPretty/selectValue");
+var _readOnlyFormatters = require("../array-table/readOnlyFormatters");
+var _cellInteractionLock = require("../array-table/cellInteractionLock");
 require("./index.less");
-var _excluded = ["request", "columnDefs", "value", "labelField", "valueField", "onChangeItem", "hideBtn", "useAutoComplete", "queryFun", "pagedApiAdapter", "modalWidth", "dialogZIndex", "dialogMode", "dialogPageSize", "dialogPageSizeOptions", "dialogGridKey", "dialogDataSource", "dialogIsRowSelectable", "dialogRenderer", "gridComponent"],
-  _excluded2 = ["request", "columnDefs", "labelField", "valueField", "onChangeItem", "hideBtn", "useAutoComplete", "queryFun", "pagedApiAdapter", "modalWidth", "dialogZIndex", "dialogMode", "dialogPageSize", "dialogPageSizeOptions", "dialogGridKey", "dialogDataSource", "dialogIsRowSelectable", "dialogRenderer", "gridComponent"];
+var _excluded = ["request", "columnDefs", "value", "labelField", "valueField", "displayField", "onChangeItem", "hideBtn", "useAutoComplete", "queryFun", "pagedApiAdapter", "modalWidth", "dialogZIndex", "dialogMode", "dialogPageSize", "dialogPageSizeOptions", "dialogGridKey", "dialogDataSource", "dialogIsRowSelectable", "dialogRenderer", "gridComponent"],
+  _excluded2 = ["request", "columnDefs", "labelField", "valueField", "displayField", "onChangeItem", "hideBtn", "useAutoComplete", "queryFun", "pagedApiAdapter", "modalWidth", "dialogZIndex", "dialogMode", "dialogPageSize", "dialogPageSizeOptions", "dialogGridKey", "dialogDataSource", "dialogIsRowSelectable", "dialogRenderer", "gridComponent"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -49,6 +51,7 @@ var DialogSelectInner = function DialogSelectInner(props) {
     value = props.value,
     labelField = props.labelField,
     valueField = props.valueField,
+    displayField = props.displayField,
     onChangeItem = props.onChangeItem,
     hideBtn = props.hideBtn,
     useAutoComplete = props.useAutoComplete,
@@ -78,6 +81,7 @@ var DialogSelectInner = function DialogSelectInner(props) {
     _useBoolean2$ = _useBoolean2[1],
     setTrue = _useBoolean2$.setTrue,
     setFalse = _useBoolean2$.setFalse;
+  (0, _cellInteractionLock.useCellInteractionLock)(visible);
   var _useState = (0, _react2.useState)(undefined),
     _useState2 = _slicedToArray(_useState, 2),
     selectRows = _useState2[0],
@@ -149,7 +153,11 @@ var DialogSelectInner = function DialogSelectInner(props) {
     '--qc-dialog-select-trigger-color': token.colorTextTertiary,
     '--qc-dialog-select-trigger-hover': token.colorPrimary
   };
-  var commonProps = _objectSpread(_objectSpread({}, rest), {}, {
+  var commonProps = _objectSpread(_objectSpread(_objectSpread({}, rest), displayField === 'value' ? {
+    labelRender: function labelRender(item) {
+      return (0, _readOnlyFormatters.formatSelectDisplay)(item, 'value');
+    }
+  } : {}), {}, {
     className: mergedClassName,
     value: state,
     style: _objectSpread(_objectSpread({}, triggerStyle), rest.style || {})
@@ -289,6 +297,7 @@ var DialogSelect = (0, _react.observer)(function (props) {
       columnDefs = safeProps.columnDefs,
       labelField = safeProps.labelField,
       valueField = safeProps.valueField,
+      displayField = safeProps.displayField,
       onChangeItem = safeProps.onChangeItem,
       hideBtn = safeProps.hideBtn,
       useAutoComplete = safeProps.useAutoComplete,
@@ -305,6 +314,7 @@ var DialogSelect = (0, _react.observer)(function (props) {
       dialogRenderer = safeProps.dialogRenderer,
       gridComponent = safeProps.gridComponent,
       selectProps = _objectWithoutProperties(safeProps, _excluded2);
+    if (displayField === 'value') return /*#__PURE__*/_react2.default.createElement("span", null, (0, _readOnlyFormatters.formatSelectDisplay)('value' in safeProps ? safeProps.value : safeProps.defaultValue, 'value') || '—');
     return /*#__PURE__*/_react2.default.createElement(_controls.Select, _extends({}, selectProps, {
       disabled: true
     }));