@nokecy/qc-ui 1.1.68 → 1.1.69

package/dist/esm/ag-grid-plus/setting/ColumnConfigTable.js

@@ -20,7 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 
 import React, { useCallback, useMemo, useState, useRef, useEffect } from 'react';
-import { Button, Select, Switch, Space, Popconfirm, message, Tag } from 'antd';
+import { Button, Select, Switch, Space, Popconfirm, message, Tag, theme } from 'antd';
 import { DeleteOutlined, FolderOutlined, FolderAddOutlined, FileOutlined } from '@ant-design/icons';
 import { AgGridReact } from 'ag-grid-react';
 import { generateId, normalizeCellAlign } from "./columnGroupUtils";
@@ -239,6 +239,8 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
     _ref2$scrollY = _ref2.scrollY,
     scrollY = _ref2$scrollY === void 0 ? 480 : _ref2$scrollY;
   var gridTheme = useAgGridTheme();
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token; // 颜色取主题 token,跟随亮/暗主题 @author nokecy
   var _useState = useState(items),
     _useState2 = _slicedToArray(_useState, 2),
     localItems = _useState2[0],
@@ -681,16 +683,18 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
     return localItems.filter(isNodeVisible);
   }, [localItems, expandedKeys, simple]);
 
-  // 添加拖拽样式
+  // 添加拖拽样式:选择器限定在本表容器(.qc-column-config-table)内,免得弹窗打开期间染到背后列表的行;
+  // 拖拽幽灵挂在 body 上,只能全局。颜色取主题 token。@author nokecy
   useEffect(function () {
     var style = document.createElement('style');
-    style.textContent = "\n      /* \u62D6\u62FD\u884C\u6837\u5F0F */\n      .ag-row-dragging {\n        opacity: 0.5;\n        transition: opacity 0.2s ease;\n      }\n\n      /* \u62D6\u62FD\u5E7D\u7075\u6837\u5F0F */\n      .ag-dnd-ghost {\n        background: #fff !important;\n        border: 2px dashed #1890ff !important;\n        border-radius: 4px !important;\n        padding: 8px !important;\n        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15) !important;\n        opacity: 0.9 !important;\n        font-size: 14px !important;\n      }\n\n      /* \u53EF\u653E\u7F6E\u76EE\u6807\u9AD8\u4EAE */\n      .ag-row-hover.ag-row {\n        background-color: #e6f7ff !important;\n        transition: background-color 0.2s ease;\n      }\n\n      /* \u5206\u7EC4\u884C\u7279\u6B8A\u9AD8\u4EAE */\n      .ag-row-hover.ag-row[row-id*=\"group\"] {\n        background-color: #bae7ff !important;\n        border: 2px solid #1890ff;\n        transition: all 0.2s ease;\n      }\n\n      /* \u884C\u52A8\u753B */\n      .ag-row {\n        transition: transform 0.3s ease, opacity 0.3s ease;\n      }\n\n      /* \u62D6\u62FD\u624B\u67C4\u6837\u5F0F */\n      .ag-row .ag-cell[col-id=\"type\"] {\n        cursor: grab !important;\n      }\n\n      .ag-row-dragging .ag-cell[col-id=\"type\"] {\n        cursor: grabbing !important;\n      }\n    ";
+    style.textContent = "\n      /* \u62D6\u62FD\u884C\u6837\u5F0F */\n      .qc-column-config-table .ag-row-dragging {\n        opacity: 0.5;\n        transition: opacity 0.2s ease;\n      }\n\n      /* \u62D6\u62FD\u5E7D\u7075\u6837\u5F0F */\n      .ag-dnd-ghost {\n        background: ".concat(token.colorBgElevated, " !important;\n        color: ").concat(token.colorText, " !important;\n        border: 2px dashed ").concat(token.colorPrimary, " !important;\n        border-radius: 4px !important;\n        padding: 8px !important;\n        box-shadow: ").concat(token.boxShadowSecondary, " !important;\n        opacity: 0.9 !important;\n        font-size: 14px !important;\n      }\n\n      /* \u53EF\u653E\u7F6E\u76EE\u6807\u9AD8\u4EAE */\n      .qc-column-config-table .ag-row-hover.ag-row {\n        background-color: ").concat(token.controlItemBgHover, " !important;\n        transition: background-color 0.2s ease;\n      }\n\n      /* \u5206\u7EC4\u884C\u7279\u6B8A\u9AD8\u4EAE */\n      .qc-column-config-table .ag-row-hover.ag-row[row-id*=\"group\"] {\n        background-color: ").concat(token.controlItemBgActive, " !important;\n        border: 2px solid ").concat(token.colorPrimary, ";\n        transition: all 0.2s ease;\n      }\n\n      /* \u884C\u52A8\u753B */\n      .qc-column-config-table .ag-row {\n        transition: transform 0.3s ease, opacity 0.3s ease;\n      }\n\n      /* \u62D6\u62FD\u624B\u67C4\u6837\u5F0F */\n      .qc-column-config-table .ag-row .ag-cell[col-id=\"type\"] {\n        cursor: grab !important;\n      }\n\n      .qc-column-config-table .ag-row-dragging .ag-cell[col-id=\"type\"] {\n        cursor: grabbing !important;\n      }\n    ");
     document.head.appendChild(style);
     return function () {
       document.head.removeChild(style);
     };
-  }, []);
+  }, [token]);
   return /*#__PURE__*/React.createElement("div", {
+    className: "qc-column-config-table",
     style: {
       width: '100%'
     }

package/dist/esm/ag-grid-plus/setting/ColumnNameCellRenderer.js

@@ -15,7 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 
 import React, { useState, useCallback, useMemo } from 'react';
-import { Input, Typography, Button, Tooltip } from 'antd';
+import { Input, Typography, Button, Tooltip, theme } from 'antd';
 import { UndoOutlined, InfoCircleOutlined, HolderOutlined } from '@ant-design/icons';
 var Text = Typography.Text;
 /**
@@ -27,6 +27,9 @@ export var ColumnNameCellRenderer = function ColumnNameCellRenderer(props) {
     expandedKeys = props.expandedKeys,
     onToggleExpand = props.onToggleExpand,
     allItems = props.allItems;
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token; // 颜色取主题 token,跟随亮/暗主题 @author nokecy
+
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isEditing = _useState2[0],
@@ -111,7 +114,7 @@ export var ColumnNameCellRenderer = function ColumnNameCellRenderer(props) {
       width: 16,
       display: 'inline-block',
       fontSize: '12px',
-      color: '#666'
+      color: token.colorTextSecondary
     }
   }, isExpanded ? '▼' : '▶') : /*#__PURE__*/React.createElement("span", {
     style: {
@@ -120,7 +123,7 @@ export var ColumnNameCellRenderer = function ColumnNameCellRenderer(props) {
     }
   }), /*#__PURE__*/React.createElement(HolderOutlined, {
     style: {
-      color: '#999',
+      color: token.colorTextTertiary,
       cursor: 'grab',
       fontSize: '14px'
     }
@@ -143,7 +146,7 @@ export var ColumnNameCellRenderer = function ColumnNameCellRenderer(props) {
     type: "secondary",
     style: {
       fontSize: '11px',
-      color: '#8c8c8c',
+      color: token.colorTextTertiary,
       lineHeight: '16px'
     }
   }, "\u539F\u59CB: ", item.originalHeaderName), /*#__PURE__*/React.createElement(Tooltip, {
@@ -151,7 +154,7 @@ export var ColumnNameCellRenderer = function ColumnNameCellRenderer(props) {
   }, /*#__PURE__*/React.createElement(InfoCircleOutlined, {
     style: {
       fontSize: '11px',
-      color: '#1890ff',
+      color: token.colorPrimary,
       cursor: 'help'
     }
   }))), /*#__PURE__*/React.createElement("div", {
@@ -173,10 +176,10 @@ export var ColumnNameCellRenderer = function ColumnNameCellRenderer(props) {
       flex: 1,
       fontSize: '14px',
       fontWeight: item.type === 'group' ? 600 : 400,
-      borderBottom: isEditing ? '1px solid #1890ff' : '1px solid transparent',
+      borderBottom: isEditing ? "1px solid ".concat(token.colorPrimary) : '1px solid transparent',
       transition: 'border-color 0.2s',
       padding: '0 4px',
-      color: isModified ? '#1890ff' : 'rgba(0, 0, 0, 0.85)'
+      color: isModified ? token.colorPrimary : token.colorText
     }
   }), isModified && /*#__PURE__*/React.createElement(Tooltip, {
     title: "\u91CD\u7F6E\u4E3A\u539F\u59CB\u540D\u79F0"

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

@@ -25,7 +25,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useCallback, useMemo, useEffect } from 'react';
 import { logger } from "../utils/logger";
-import { Modal, Tabs, Space, Button, Input, message, Popconfirm, Tag, Tooltip, Empty } from 'antd';
+import { Modal, Tabs, Space, Button, Input, message, Popconfirm, Tag, Tooltip, Empty, theme } from 'antd';
 import { SaveOutlined, ReloadOutlined, EditOutlined, DeleteOutlined, StarOutlined, StarFilled, SearchOutlined,
 // 全局配置相关图标
 GlobalOutlined, RollbackOutlined, ClearOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
@@ -52,6 +52,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
     onSaveColumnState = _ref.onSaveColumnState,
     allColDefsProp = _ref.allColDefs;
   var gridTheme = useAgGridTheme();
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token; // 颜色取主题 token,跟随亮/暗主题 @author nokecy
   // 使用新的集中式方案管理 API（包含状态数据和操作方法）
   var _useGridSchemes = useGridSchemes(),
     columnSchemes = _useGridSchemes.columnSchemes,
@@ -946,7 +948,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       title: '重置所有用户配置',
       content: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", {
         style: {
-          color: '#ff4d4f',
+          color: token.colorError,
           fontWeight: 'bold'
         }
       }, "\u6B64\u64CD\u4F5C\u4E0D\u53EF\u6062\u590D\uFF01"), /*#__PURE__*/React.createElement("p", null, "\u786E\u5B9A\u8981\u5220\u9664\u6240\u6709\u7528\u6237\u7684\u4E2A\u4EBA\u5217\u914D\u7F6E\u5417\uFF1F"), /*#__PURE__*/React.createElement("p", null, "\u6267\u884C\u540E\uFF0C\u6240\u6709\u7528\u6237\u5C06\u4F7F\u7528\u5168\u5C40\u9ED8\u8BA4\u914D\u7F6E\u3002")),
@@ -1177,7 +1179,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
         marginLeft: 16,
         fontSize: 14,
         fontWeight: 'normal',
-        color: '#1890ff'
+        color: token.colorPrimary
       }
     }, "- \u5F53\u524D\u65B9\u6848: ", currentScheme.name, isUsingGlobalFallback && currentScheme.isGlobal && /*#__PURE__*/React.createElement(Tag, {
       color: "orange",

package/dist/esm/ag-grid-plus/setting/MoveNodeModal.js

@@ -4,7 +4,7 @@
  */
 
 import React, { useMemo } from 'react';
-import { Modal, Tree, message } from 'antd';
+import { Modal, Tree, message, theme } from 'antd';
 import { FolderOutlined, FileOutlined } from '@ant-design/icons';
 import DraggableModal from "../../draggableModal";
 var MoveNodeModal = function MoveNodeModal(_ref) {
@@ -13,6 +13,8 @@ var MoveNodeModal = function MoveNodeModal(_ref) {
     allItems = _ref.allItems,
     onCancel = _ref.onCancel,
     onConfirm = _ref.onConfirm;
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token; // 颜色取主题 token,跟随亮/暗主题 @author nokecy
   /**
    * 将扁平数据转换为 Tree 结构
    */
@@ -133,7 +135,7 @@ var MoveNodeModal = function MoveNodeModal(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: 16,
-      color: '#666'
+      color: token.colorTextSecondary
     }
   }, "\u8BF7\u9009\u62E9\u76EE\u6807\u7236\u8282\u70B9(\u53EA\u80FD\u9009\u62E9\u5206\u7EC4\u8282\u70B9):"), /*#__PURE__*/React.createElement(Tree, {
     showIcon: true,

package/dist/esm/ag-grid-plus/setting/NameColumnRenderer.js

@@ -4,7 +4,7 @@
  */
 
 import React from 'react';
-import { Input, Tag } from 'antd';
+import { Input, Tag, theme } from 'antd';
 import { FolderOutlined, FileOutlined } from '@ant-design/icons';
 /**
  * 名称列渲染组件
@@ -18,6 +18,8 @@ var NameColumnRenderer = function NameColumnRenderer(_ref) {
   var type = record.type,
     level = record.level,
     _isNew = record._isNew;
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token; // 颜色取主题 token,跟随亮/暗主题 @author nokecy
 
   // 计算缩进（每层 20px）
   var indent = level * 20;
@@ -38,12 +40,12 @@ var NameColumnRenderer = function NameColumnRenderer(_ref) {
   // 节点类型图标
   var NodeIcon = type === 'group' ? /*#__PURE__*/React.createElement(FolderOutlined, {
     style: {
-      color: '#1890ff',
+      color: token.colorPrimary,
       fontSize: 14
     }
   }) : /*#__PURE__*/React.createElement(FileOutlined, {
     style: {
-      color: '#52c41a',
+      color: token.colorSuccess,
       fontSize: 14
     }
   });
@@ -56,7 +58,7 @@ var NameColumnRenderer = function NameColumnRenderer(_ref) {
     }
   }, level > 0 && /*#__PURE__*/React.createElement("span", {
     style: {
-      color: '#999',
+      color: token.colorTextTertiary,
       fontFamily: 'monospace',
       fontSize: 12,
       flexShrink: 0
@@ -80,7 +82,7 @@ var NameColumnRenderer = function NameColumnRenderer(_ref) {
     placeholder: type === 'group' ? '请输入分组名称' : '请输入列名称',
     style: {
       flex: 1,
-      background: _isNew ? '#fff7e6' : 'transparent' // 新添加的节点高亮
+      background: _isNew ? token.colorWarningBg : 'transparent' // 新添加的节点高亮
     }
   }));
 };

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

@@ -25,7 +25,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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; }
 import React, { useState, useCallback, useMemo, useRef } from 'react';
-import { Tabs, Button, Input, Space, message, Popconfirm, Tag, Tooltip, Switch } from 'antd';
+import { Tabs, Button, Input, Space, message, Popconfirm, Tag, Tooltip, Switch, theme } from 'antd';
 import DraggableModal from "../../draggableModal";
 import { EditOutlined, DeleteOutlined, StarOutlined, StarFilled } from '@ant-design/icons';
 import { AgGridReact } from 'ag-grid-react';
@@ -51,6 +51,8 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
     visible = _ref.visible,
     onClose = _ref.onClose;
   var gridTheme = useAgGridTheme();
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token; // 颜色取主题 token,跟随亮/暗主题 @author nokecy
   // 获取方案管理 API
   var _useGridSchemes = useGridSchemes(),
     querySchemes = _useGridSchemes.querySchemes,
@@ -599,7 +601,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
     }
     return /*#__PURE__*/React.createElement(Space, null, scheme.isDefault && /*#__PURE__*/React.createElement(StarFilled, {
       style: {
-        color: '#faad14'
+        color: token.colorWarning
       }
     }), /*#__PURE__*/React.createElement("span", null, scheme.name), isCurrent && /*#__PURE__*/React.createElement(Tag, {
       color: "blue"
@@ -701,7 +703,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
         marginLeft: 16,
         fontSize: 14,
         fontWeight: 'normal',
-        color: '#1890ff'
+        color: token.colorPrimary
       }
     }, "- \u5F53\u524D\u65B9\u6848: ", currentScheme.name)),
     open: visible,
@@ -722,30 +724,30 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
         style: {
           marginBottom: 16,
           padding: '12px 16px',
-          background: currentScheme ? '#e6f7ff' : '#f5f5f5',
+          background: currentScheme ? token.colorPrimaryBg : token.colorFillTertiary,
           borderRadius: 4,
           border: '1px solid',
-          borderColor: currentScheme ? '#91d5ff' : '#d9d9d9'
+          borderColor: currentScheme ? token.colorPrimaryBorder : token.colorBorder
         }
       }, currentScheme ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
         style: {
           fontWeight: 600,
           marginBottom: 4,
-          color: '#1890ff'
+          color: token.colorPrimary
         }
       }, "\u5F53\u524D\u65B9\u6848: ", currentScheme.name), currentScheme.description && /*#__PURE__*/React.createElement("div", {
         style: {
           fontSize: 12,
-          color: '#666'
+          color: token.colorTextSecondary
         }
       }, currentScheme.description)) : /*#__PURE__*/React.createElement("div", {
         style: {
-          color: '#666'
+          color: token.colorTextSecondary
         }
       }, "\u672A\u9009\u62E9\u65B9\u6848 - \u4F7F\u7528\u4E34\u65F6\u914D\u7F6E")), /*#__PURE__*/React.createElement("div", {
         style: {
           marginBottom: 16,
-          color: '#666'
+          color: token.colorTextSecondary
         }
       }, "\u62D6\u62FD\u4E0B\u65B9\u67E5\u8BE2\u9879\u8C03\u6574\u987A\u5E8F\uFF0C\u4F7F\u7528\u5F00\u5173\u63A7\u5236\u663E\u793A/\u9690\u85CF\uFF0C\u5B8C\u6210\u540E\u53EF\u5E94\u7528\u6216\u4FDD\u5B58\u4E3A\u65B9\u6848"), /*#__PURE__*/React.createElement("div", {
         style: {

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

@@ -207,6 +207,8 @@ export function processEllipsisColumn(col) {
     return col;
   }
   return _objectSpread(_objectSpread({}, col), {}, {
+    // 块级占满单元格,对齐继承单元格的 text-align(列方案的左/中/右对齐、数字列右对齐);
+    // 以前写死 flex 居中,列方案选左对齐也居中,且 flex 容器里省略号不截断。@author nokecy
     cellRenderer: function cellRenderer(_ref) {
       var value = _ref.value;
       return /*#__PURE__*/React.createElement(Text, {
@@ -214,9 +216,10 @@ export function processEllipsisColumn(col) {
           tooltip: value
         },
         style: {
-          display: 'flex',
-          justifyContent: 'center',
-          alignItems: 'center'
+          display: 'block',
+          width: '100%',
+          color: 'inherit',
+          lineHeight: 'inherit'
         }
       }, value);
     }

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

@@ -5,6 +5,14 @@ export type ReadOnlyFormatterCtx = {
     fieldSchema: any;
 };
 export type ReadOnlyFormatter = (value: any, ctx: ReadOnlyFormatterCtx) => string;
+/**
+ * 兜底格式化器:注册表里没有的组件(业务自定义的选择器、输入框等),可编辑列按它出懒挂载文本。
+ *
+ * 显示与控件失焦时看到的一致:原始值原样显示;labelInValue 对象 / 解构字段({value,label})显示 label,
+ * 没有 label 才显示 value;数组逐个显示后逗号拼接。显示需要按编码查名称等特殊逻辑的组件,
+ * 消费方用 registerReadOnlyFormatter 注册专用格式化器覆盖。@author nokecy
+ */
+export declare const fallbackFormatter: ReadOnlyFormatter;
 /** 消费方扩展自定义只读列的显示逻辑 */
 export declare const registerReadOnlyFormatter: (component: string, formatter: ReadOnlyFormatter) => void;
 /**

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

@@ -94,6 +94,28 @@ var registry = {
   Checkbox: booleanFormatter
 };
 
+/**
+ * 兜底格式化器:注册表里没有的组件(业务自定义的选择器、输入框等),可编辑列按它出懒挂载文本。
+ *
+ * 显示与控件失焦时看到的一致:原始值原样显示;labelInValue 对象 / 解构字段({value,label})显示 label,
+ * 没有 label 才显示 value;数组逐个显示后逗号拼接。显示需要按编码查名称等特殊逻辑的组件,
+ * 消费方用 registerReadOnlyFormatter 注册专用格式化器覆盖。@author nokecy
+ */
+export var fallbackFormatter = function fallbackFormatter(value, ctx) {
+  if (value == null || value === '') return '';
+  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;
+    if (typeof value.format === 'function') return dateFormatter(value, ctx);
+    var shown = (_value$label2 = value.label) !== null && _value$label2 !== void 0 ? _value$label2 : value.value;
+    return shown == null ? '' : String(shown);
+  }
+  return String(value);
+};
+
 /** 消费方扩展自定义只读列的显示逻辑 */
 export var registerReadOnlyFormatter = function registerReadOnlyFormatter(component, formatter) {
   registry[component] = formatter;

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

@@ -9,20 +9,20 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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 _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); }
 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 { fallbackFormatter, getReadOnlyFormatter } from "./readOnlyFormatters";
 import { markHeaderGroup } from "./columnGroup";
 import { CellFocusScope } from "./cellFocusScope";
 var isColumnComponent = function isColumnComponent(schema) {
@@ -159,6 +159,32 @@ var isSimpleFieldPath = function isSimpleFieldPath(name) {
   return !!name && /^[^.{}[\]*]+(\.[^.{}[\]*]+)*$/.test(name);
 };
 
+/**
+ * 解析对象解构字段名 `{value:code,label:name}`(选择器 labelInValue 常用),返回 [对象键, 数据路径] 列表;
+ * 不是对象解构、或成员路径不是简单点号路径时返回 null(调用方回退 AgField 全树)。
+ * 成员可简写成 `{code}`,等同 `{code:code}`。@author nokecy
+ */
+var parseObjectDestructure = function parseObjectDestructure(name) {
+  var matched = name && /^\{([^{}]+)\}$/.exec(name.trim());
+  if (!matched) return null;
+  var members = matched[1].split(',').map(function (part) {
+    return part.split(':').map(function (x) {
+      return x.trim();
+    });
+  });
+  if (members.some(function (m) {
+    return m.length > 2 || !m[0] || !isSimpleFieldPath(m[m.length - 1]);
+  })) return null;
+  return members.map(function (m) {
+    return [m[0], m[m.length - 1]];
+  });
+};
+
+/** 快路径(只读文本/懒挂载)能自己解析取值的字段名:简单点号路径或对象解构 @author nokecy */
+var isFastPathFieldName = function isFastPathFieldName(name) {
+  return isSimpleFieldPath(name) || !!parseObjectDestructure(name);
+};
+
 /**
  * 按 Formily 字段名从行数据取值。
  *
@@ -169,6 +195,14 @@ var isSimpleFieldPath = function isSimpleFieldPath(name) {
  */
 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];
+    return [key, readByFieldPath(record, memberPath)];
+  }));
   if (path.indexOf('.') < 0) return record[path];
   return path.split('.').reduce(function (acc, key) {
     return acc == null ? undefined : acc[key];
@@ -328,7 +362,7 @@ var LazyAgField = function LazyAgField(params) {
 
   /** 焦点离开本格:校验通过才卸回懒挂载文本。isStale 为真说明校验期间焦点又回来了或格子已销毁 */
   var handleLeave = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(isStale) {
+    var _ref5 = _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) {
@@ -372,7 +406,7 @@ var LazyAgField = function LazyAgField(params) {
       }, _callee, null, [[3, 8]]);
     }));
     return function handleLeave(_x) {
-      return _ref3.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -542,11 +576,12 @@ 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, _ref4, key) {
-    var name = _ref4.name,
-      columnProps = _ref4.columnProps,
-      schema = _ref4.schema,
-      display = _ref4.display;
+  return sources.reduce(function (buf, _ref6, key) {
+    var _getReadOnlyFormatter;
+    var name = _ref6.name,
+      columnProps = _ref6.columnProps,
+      schema = _ref6.schema,
+      display = _ref6.display;
     if (display && display !== 'visible') return buf;
     if (!isColumnComponent(schema)) return buf;
 
@@ -585,8 +620,10 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
     //   ③ 兜底全树:其余(无格式化器/带 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);
+    // 可编辑的数据字段(非 void 操作按钮)即使是业务自定义组件,也按兜底格式化器出懒挂载文本,默认阅读态;
+    // 只读列不兜底:自定义只读组件常显示别的字段(如 SiblingText),按自身值出文本会错。@author nokecy
+    var formatter = (_getReadOnlyFormatter = getReadOnlyFormatter(component)) !== null && _getReadOnlyFormatter !== void 0 ? _getReadOnlyFormatter : !readOnly && component && (dataField === null || dataField === void 0 ? void 0 : dataField.type) !== 'void' ? fallbackFormatter : null;
     var hasReactions = !!(dataField && dataField['x-reactions']);
     if (!readOnly) applyNumberInputDefaults(dataField);
     var forceEager = (columnProps === null || columnProps === void 0 ? void 0 : columnProps.forceAgField) === true;
@@ -603,9 +640,9 @@ var buildArrayTableColumns = function buildArrayTableColumns(dataSource, field,
     var valueGetter = dataFieldName && dataFieldName !== name ? function (params) {
       return readByFieldPath(params === null || params === void 0 ? void 0 : params.data, dataFieldName);
     } : undefined;
-    // 字段名是路径:`item.qty` 的值在 record.item.qty。快路径自己解析,只认点号分段;
-    // 解构(`{value:a,label:b}`)/数组下标等复杂语法解析不了,回退全树交给 Formily。@author nokecy
-    var canFastPath = !dataFieldName || isSimpleFieldPath(dataFieldName);
+    // 字段名是路径:`item.qty` 的值在 record.item.qty。快路径自己解析点号分段与对象解构(`{value:a,label:b}`);
+    // 数组解构/下标等其余语法解析不了,回退全树交给 Formily。@author nokecy
+    var canFastPath = !dataFieldName || isFastPathFieldName(dataFieldName);
 
     // ① 只读纯文本
     if (readOnly && formatter && canFastPath) {