@nokecy/qc-ui 1.1.56 → 1.1.58

package/dist/esm/ag-grid-plus/ag-gridPlus.js

@@ -28,7 +28,7 @@ import { AllEnterpriseModule } from "ag-grid-enterprise";
 ModuleRegistry.registerModules([AllEnterpriseModule]);
 
 // 导入 AG-Grid v33 主题
-import { agGridTheme } from "./theme";
+import { useAgGridTheme } from "./theme";
 import { useTypeInferenceRow } from "./hooks/useTypeInferenceRow";
 import "./index.less";
 import FormRender from "./queryForm";
@@ -36,7 +36,7 @@ import ToolBar from "./toolBar";
 import SettingItem from "./settingItem";
 import { RedoOutlined, FilterOutlined } from '@ant-design/icons';
 import { convertFilterModel, dateTimeValueFormatter, dateValueFormatter, flatten, toTree } from "./utils";
-import { processEnumColumn, toColumnType } from "./utils/columnProcessors";
+import { mergeInferredColumnType, processEnumColumn } from "./utils/columnProcessors";
 import AdvancedQueryBuilder from "./queryForm/AdvancedQueryBuilder";
 import { v4 as uuidv4 } from 'uuid';
 import Setting from "./setting";
@@ -55,7 +55,7 @@ import { QueryFormContext } from "./context/queryFormContext";
 import { useGridSchemes } from "./context/useSchemeManager";
 import { useSchemeDataFlow } from "./context/useSchemeDataFlow";
 import { extractItemsOrder, extractHiddenFields } from "./shared/utils/schemeDataMigration";
-import { computeAggregationRow } from "./utils/aggregation";
+import { computeAggregationRow, getCalculationColumns } from "./utils/aggregation";
 import { sortFormItemsByOrder, filterHiddenFormItems } from "./utils/queryFormDerivation";
 import { filterVisibleSelectedRows } from "./utils/rowSelection";
 import { buildFilterString, pageToSkipCount } from "./utils/requestParams";
@@ -78,6 +78,7 @@ function useDeepCompareStable(value) {
   return ref.current;
 }
 function AgGridPlus(props) {
+  var gridTheme = useAgGridTheme();
   var style = props.style,
     loadingProps = props.loading,
     gridParams = props.params,
@@ -432,11 +433,10 @@ function AgGridPlus(props) {
   // 辅助函数: 获取数据类型
   var getDataType = function getDataType(data, colName, valueEnum) {
     if (typeof data[colName] === 'number') {
-      // 如果有枚举值，说明是分类数据，不进行计算;否则默认求和
-      var shouldCalculate = !valueEnum || valueEnum.length === 0;
+      // 数值只用于列对齐；底部合计必须由 calculateType 显式声明。@author nokecy
       return {
         type: "number",
-        calculateType: shouldCalculate ? "sum" : false
+        calculateType: valueEnum !== null && valueEnum !== void 0 && valueEnum.length ? false : undefined
       };
     }
     return undefined;
@@ -464,11 +464,11 @@ function AgGridPlus(props) {
       return processEnumColumn(col, dataType);
     }
     if (col.type || typeof col.cellRenderer == "string") {
-      return _objectSpread({}, col);
+      return mergeInferredColumnType(col, dataType);
     }
     //@ts-ignore
     if (col !== null && col !== void 0 && col.ellipsis) {
-      return _objectSpread(_objectSpread({}, col), {}, {
+      return _objectSpread(_objectSpread({}, mergeInferredColumnType(col, dataType)), {}, {
         cellRenderer: function cellRenderer(_ref) {
           var value = _ref.value;
           return /*#__PURE__*/React.createElement(Text, {
@@ -485,12 +485,12 @@ function AgGridPlus(props) {
       });
     }
     if (col.cellRenderer) {
-      return _objectSpread(_objectSpread({}, col), {}, {
+      return _objectSpread(_objectSpread({}, mergeInferredColumnType(col, dataType)), {}, {
         customCellRenderer: col.cellRenderer,
         cellRenderer: cellRenderer
       });
     }
-    return _objectSpread(_objectSpread(_objectSpread({}, toColumnType(dataType)), col), {}, {
+    return _objectSpread(_objectSpread({}, mergeInferredColumnType(col, dataType)), {}, {
       customCellRenderer: col.cellRenderer,
       cellRenderer: cellRenderer
     });
@@ -940,6 +940,7 @@ function AgGridPlus(props) {
     }
   };
   var calculateSum = useCallback(function () {
+    if (props.pinnedBottomRowData !== undefined) return;
     var displayedData = [];
     if (apiRef.current) {
       apiRef.current.forEachNodeAfterFilter(function (node) {
@@ -951,22 +952,16 @@ function AgGridPlus(props) {
       (_apiRef$current4 = apiRef.current) === null || _apiRef$current4 === void 0 || _apiRef$current4.setGridOption('pinnedBottomRowData', undefined);
       return;
     }
-    var calcColFields = allColDefs.filter(function (col) {
-      return col.calculateType;
-    }).map(function (col) {
-      return {
-        field: col.field,
-        calculateType: col.calculateType,
-        transactionAmount: col.transactionAmount || 2,
-        formatWithCommas: col.formatWithCommas
-      };
-    });
+    var calcColFields = getCalculationColumns(allColDefs);
     if (calcColFields.length > 0) {
       var _apiRef$current5;
       var calculatedValues = computeAggregationRow(calcColFields, displayedData);
       (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 || _apiRef$current5.setGridOption('pinnedBottomRowData', calculatedValues);
+    } else {
+      var _apiRef$current6;
+      (_apiRef$current6 = apiRef.current) === null || _apiRef$current6 === void 0 || _apiRef$current6.setGridOption('pinnedBottomRowData', undefined);
     }
-  }, [allColDefs]);
+  }, [allColDefs, props.pinnedBottomRowData]);
   var onFilterChanged = function onFilterChanged(event) {
     calculateSum();
   };
@@ -1312,7 +1307,7 @@ function AgGridPlus(props) {
       }
     }, /*#__PURE__*/React.createElement(FilterOutlined, null)))) : null].filter(Boolean)
   }), /*#__PURE__*/React.createElement(AgGridReact, _extends({
-    theme: agGridTheme
+    theme: gridTheme
   }, rest, {
     localeText: localeText,
     gridOptions: {
@@ -1360,8 +1355,8 @@ function AgGridPlus(props) {
     },
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
-        var _apiRef$current6;
-        var _columnState = (_apiRef$current6 = apiRef.current) === null || _apiRef$current6 === void 0 ? void 0 : _apiRef$current6.getColumnState();
+        var _apiRef$current7;
+        var _columnState = (_apiRef$current7 = apiRef.current) === null || _apiRef$current7 === void 0 ? void 0 : _apiRef$current7.getColumnState();
         setColumnState(_columnState);
 
         // onColumnStateChanged && onColumnStateChanged(columnState)

package/dist/esm/ag-grid-plus/index.less

@@ -28,12 +28,12 @@
 }
 
 .ag-root-wrapper-body .ag-center-cols-viewport .ag-center-cols-container .ag-checkbox .ag-checkbox-input-wrapper {
-  width: 18px !important;
-  height: 18px !important;
+  width: 16px !important;
+  height: 16px !important;
 }
 .ag-root-wrapper-body .ag-header-viewport .ag-checkbox .ag-checkbox-input-wrapper {
-  width: 18px !important;
-  height: 18px !important;
+  width: 16px !important;
+  height: 16px !important;
 }
 
 // 列内容对齐方式样式

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

@@ -25,7 +25,7 @@ import { DeleteOutlined, FolderOutlined, FolderAddOutlined, FileOutlined } from
 import { AgGridReact } from 'ag-grid-react';
 import { generateId } from "./columnGroupUtils";
 import { DebounceNumberInput } from "./DebounceInputs";
-import { agGridTheme } from "../theme";
+import { useAgGridTheme } from "../theme";
 import { ColumnNameCellRenderer } from "./ColumnNameCellRenderer";
 // ==================== Cell Renderers ====================
 
@@ -238,6 +238,7 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
     simple = _ref2$simple === void 0 ? false : _ref2$simple,
     _ref2$scrollY = _ref2.scrollY,
     scrollY = _ref2$scrollY === void 0 ? 480 : _ref2$scrollY;
+  var gridTheme = useAgGridTheme();
   var _useState = useState(items),
     _useState2 = _slicedToArray(_useState, 2),
     localItems = _useState2[0],
@@ -706,7 +707,7 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
       height: scrollY
     }
   }, /*#__PURE__*/React.createElement(AgGridReact, {
-    theme: agGridTheme,
+    theme: gridTheme,
     rowData: visibleItems,
     columnDefs: columnDefs,
     getRowId: function getRowId(params) {

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

@@ -30,7 +30,7 @@ import { SaveOutlined, ReloadOutlined, EditOutlined, DeleteOutlined, StarOutline
 // 全局配置相关图标
 GlobalOutlined, RollbackOutlined, ClearOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 import { AgGridReact } from 'ag-grid-react';
-import { agGridTheme } from "../theme";
+import { useAgGridTheme } from "../theme";
 import { localeText } from "../locale";
 import { createForm, onFormInit } from '@formily/core';
 import { gridStateToFlatConfig, flatConfigToGridState, flatConfigToColumnState, dropQueryOnlyItems, excludeQueryOnlyColumns, isOldSchemeData, migrateOldScheme, generateId } from "./columnGroupUtils";
@@ -50,6 +50,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
     visible = _ref.visible,
     onClose = _ref.onClose,
     onSaveColumnState = _ref.onSaveColumnState;
+  var gridTheme = useAgGridTheme();
   // 使用新的集中式方案管理 API（包含状态数据和操作方法）
   var _useGridSchemes = useGridSchemes(),
     columnSchemes = _useGridSchemes.columnSchemes,
@@ -1247,7 +1248,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       marginTop: 100
     }
   }) : /*#__PURE__*/React.createElement(AgGridReact, {
-    theme: agGridTheme,
+    theme: gridTheme,
     localeText: localeText,
     rowData: filteredSchemes,
     columnDefs: schemeColumnDefs,

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

@@ -33,7 +33,7 @@ import { useGridSchemes } from "../context/useSchemeManager";
 import { useQueryForm } from "../context/queryFormContext";
 import { v4 as uuidv4 } from 'uuid';
 import { extractItemsOrder, extractHiddenFields, buildQueryConfig } from "../shared/utils/schemeDataMigration";
-import { agGridTheme } from "../theme";
+import { useAgGridTheme } from "../theme";
 
 /**
  * 查询项数据结构
@@ -50,6 +50,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
   var gridKey = _ref.gridKey,
     visible = _ref.visible,
     onClose = _ref.onClose;
+  var gridTheme = useAgGridTheme();
   // 获取方案管理 API
   var _useGridSchemes = useGridSchemes(),
     querySchemes = _useGridSchemes.querySchemes,
@@ -753,7 +754,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
         }
       }, /*#__PURE__*/React.createElement(AgGridReact, {
         ref: queryGridRef,
-        theme: agGridTheme,
+        theme: gridTheme,
         rowData: queryItemsData,
         columnDefs: queryColumnDefs,
         defaultColDef: {
@@ -801,7 +802,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
         }
       }, /*#__PURE__*/React.createElement(AgGridReact, {
         ref: schemeGridRef,
-        theme: agGridTheme,
+        theme: gridTheme,
         rowData: schemes,
         columnDefs: schemeColumnDefs,
         defaultColDef: {

package/dist/esm/ag-grid-plus/theme.d.ts

@@ -3,3 +3,8 @@
  * 使用 themeQuartz API 替代 CSS 变量方式
  */
 export declare const agGridTheme: import("ag-grid-community").Theme<import("ag-grid-community").ThemeDefaultParams>;
+/**
+ * 根据当前 Ant Design ConfigProvider 主题生成 AgGrid 主题色。
+ * 复选框、行选中和悬停等强调状态与 antd 主色同步。@author nokecy
+ */
+export declare function useAgGridTheme(): import("ag-grid-community").Theme<import("ag-grid-community").ThemeDefaultParams>;

package/dist/esm/ag-grid-plus/theme.js

@@ -4,6 +4,8 @@
  */
 
 import { themeQuartz } from 'ag-grid-community';
+import { theme as antdTheme } from 'antd';
+import { useMemo } from 'react';
 export var agGridTheme = themeQuartz.withParams({
   // 基础颜色
   backgroundColor: '#FFFFFF',
@@ -69,4 +71,33 @@ export var agGridTheme = themeQuartz.withParams({
   // 侧边栏配置
   sideBarPanelWidth: 250,
   spacing: 6
-});
+});
+
+/**
+ * 根据当前 Ant Design ConfigProvider 主题生成 AgGrid 主题色。
+ * 复选框、行选中和悬停等强调状态与 antd 主色同步。@author nokecy
+ */
+export function useAgGridTheme() {
+  var _antdTheme$useToken = antdTheme.useToken(),
+    token = _antdTheme$useToken.token;
+  return useMemo(function () {
+    return agGridTheme.withParams({
+      accentColor: token.colorPrimary,
+      rowHoverColor: token.colorPrimaryBg,
+      selectedRowBackgroundColor: token.colorPrimaryBgHover,
+      columnHoverColor: token.colorPrimaryBg,
+      rangeSelectionBorderColor: token.colorPrimary,
+      rangeSelectionBackgroundColor: token.colorPrimaryBgHover,
+      focusShadow: "0 0 0 3px ".concat(token.colorPrimaryBg),
+      checkboxUncheckedBackgroundColor: token.colorBgContainer,
+      checkboxUncheckedBorderColor: token.colorBorder,
+      checkboxCheckedBackgroundColor: token.colorPrimary,
+      checkboxCheckedBorderColor: token.colorPrimary,
+      checkboxCheckedShapeColor: token.colorWhite,
+      checkboxIndeterminateBackgroundColor: token.colorPrimary,
+      checkboxIndeterminateBorderColor: token.colorPrimary,
+      checkboxIndeterminateShapeColor: token.colorWhite,
+      toggleButtonOnBackgroundColor: token.colorPrimary
+    });
+  }, [token.colorBgContainer, token.colorBorder, token.colorPrimary, token.colorPrimaryBg, token.colorPrimaryBgHover, token.colorWhite]);
+}

package/dist/esm/ag-grid-plus/toolBar/index.js

@@ -75,11 +75,7 @@ var ListToolBar = function ListToolBar(_ref) {
       return null;
     }
     return /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: 'flex',
-        alignItems: 'center',
-        gap: 8
-      }
+      className: "".concat(prefixCls, "-actions ").concat(hashId)
     }, actions.map(function (action, index) {
       if (! /*#__PURE__*/React.isValidElement(action)) {
         // eslint-disable-next-line react/no-array-index-key
@@ -92,7 +88,7 @@ var ListToolBar = function ListToolBar(_ref) {
         key: index
       }, action === null || action === void 0 ? void 0 : action.props));
     }));
-  }, [actions]);
+  }, [actions, hashId, prefixCls]);
   var hasRight = useMemo(function () {
     return hasTitle || actionDom || (settings === null || settings === void 0 ? void 0 : settings.length);
   }, [actionDom, hasTitle, settings === null || settings === void 0 ? void 0 : settings.length]);

package/dist/esm/ag-grid-plus/toolBar/style.js

@@ -11,6 +11,8 @@ var genProListStyle = function genProListStyle(token) {
     "&-container": {
       display: "flex",
       justifyContent: "space-between",
+      alignItems: "center",
+      minWidth: 0,
       paddingBlock: 8,
       //token.padding,
       paddingInline: 0,
@@ -48,29 +50,47 @@ var genProListStyle = function genProListStyle(token) {
     },
     "&-left": _defineProperty(_defineProperty({
       display: "flex",
-      flexWrap: "wrap",
+      flexWrap: "nowrap",
       alignItems: "center",
       gap: token.marginXS,
       justifyContent: "flex-start",
-      maxWidth: "calc(100% - 200px)",
-      flex: 1
+      minWidth: 0,
+      flex: "0 1 auto"
     }, "".concat(token.antCls, "-tabs"), {
       width: "100%"
     }), "&-has-tabs", {
       overflow: "hidden"
     }),
     "&-right": {
-      flex: 1,
+      flex: "1 1 0",
+      minWidth: 0,
       display: "flex",
-      flexWrap: "wrap",
+      flexWrap: "nowrap",
+      alignItems: "center",
       justifyContent: "flex-end",
       gap: token.marginXS
     },
+    // @author nokecy：按钮单行呈现，空间不足时只在操作区内滚动，不撑开页面。
+    "&-actions": {
+      display: "flex",
+      alignItems: "center",
+      gap: token.marginXS,
+      minWidth: 0,
+      flex: "0 1 auto",
+      overflowX: "auto",
+      overflowY: "hidden",
+      scrollbarWidth: "none",
+      whiteSpace: "nowrap",
+      "&::-webkit-scrollbar": {
+        display: "none"
+      }
+    },
     "&-extra-line": {
       marginBlockEnd: token.margin
     },
     "&-setting-items": {
       display: "flex",
+      flex: "0 0 auto",
       gap: token.marginXS,
       lineHeight: "32px",
       alignItems: "center"
@@ -121,6 +141,9 @@ var genProListStyle = function genProListStyle(token) {
     "&-left": {
       marginBlockEnd: "8px",
       maxWidth: "100%"
+    },
+    "&-right": {
+      width: "100%"
     }
   })));
 };

package/dist/esm/ag-grid-plus/utils/aggregation.d.ts

@@ -9,6 +9,15 @@ export interface CalculationColumnConfig {
     formatWithCommas?: boolean;
     cellRenderer?: any;
 }
+export interface CalculationColumnDefinition {
+    field?: string;
+    calculateType?: CalculationColumnConfig['calculateType'] | false;
+    transactionAmount?: number;
+    formatWithCommas?: boolean;
+    children?: CalculationColumnDefinition[];
+}
+/** 分组表头只是展示结构；原生固定合计行要读取所有叶子数值列。@author nokecy */
+export declare const getCalculationColumns: (columns: CalculationColumnDefinition[]) => CalculationColumnConfig[];
 export declare const isValidNumber: (value: any) => boolean;
 export declare const sumField: (field: string, data: any[]) => number;
 export declare const avgField: (field: string, data: any[]) => number;

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

@@ -5,6 +5,20 @@ import _, { uniqueId } from 'lodash';
  * @author nokecy
  */
 
+/** 分组表头只是展示结构；原生固定合计行要读取所有叶子数值列。@author nokecy */
+export var getCalculationColumns = function getCalculationColumns(columns) {
+  return columns.flatMap(function (column) {
+    var _column$transactionAm;
+    if (column.children) return getCalculationColumns(column.children);
+    if (!column.field || !column.calculateType) return [];
+    return [{
+      field: column.field,
+      calculateType: column.calculateType,
+      transactionAmount: (_column$transactionAm = column.transactionAmount) !== null && _column$transactionAm !== void 0 ? _column$transactionAm : 2,
+      formatWithCommas: column.formatWithCommas
+    }];
+  });
+};
 export var isValidNumber = function isValidNumber(value) {
   return typeof value === 'number' && !isNaN(value);
 };

package/dist/esm/ag-grid-plus/utils/columnProcessors.d.ts

@@ -56,8 +56,8 @@ export declare function inferDataType(data: any, colName: string, valueEnum?: Va
  * 早先是把整个 dataType 摊进 colDef，等于给列设了 type:"number"——而注册的 columnTypes 里
  * 根本没有叫 number 的类型，这个字段一直没生效。
  *
- * 数量型数值列真正该有的是右对齐：位数对齐了才能一眼比大小。只有 calculateType 为真
- * （可求和的数量型）才右对齐；用 valueEnum 表示分类的数值列（状态码之类）不动。
+ * 普通数值列右对齐；合计另由 calculateType 显式控制。
+ * 用 valueEnum 表示分类的数值列（状态码之类）不动。
  *
  * @author nokecy
  */
@@ -65,6 +65,8 @@ export declare function toColumnType(dataType?: DataTypeInference): {
     calculateType?: any;
     type?: string;
 };
+/** 显式列类型只控制显示方式，不遮蔽数值对齐或显式合计配置。@author nokecy */
+export declare function mergeInferredColumnType<T extends object>(column: T, dataType?: DataTypeInference): T & ReturnType<typeof toColumnType>;
 /**
  * 处理枚举列定义 —— **枚举列渲染的唯一实现**。
  *

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

@@ -60,11 +60,10 @@ export function handleGridPlusColumnState(columnState) {
 export function inferDataType(data, colName, valueEnum) {
   var value = data[colName];
   if (typeof value === 'number') {
-    // 如果有枚举值，说明是分类数据，不进行计算
-    var shouldCalculate = !valueEnum || valueEnum.length === 0;
+    // 数值只决定对齐；合计必须由列定义显式声明。@author nokecy
     return {
       type: 'number',
-      calculateType: shouldCalculate ? 'sum' : false
+      calculateType: valueEnum !== null && valueEnum !== void 0 && valueEnum.length ? false : undefined
     };
   }
   if (typeof value === 'boolean') {
@@ -89,17 +88,19 @@ export function inferDataType(data, colName, valueEnum) {
  * 早先是把整个 dataType 摊进 colDef，等于给列设了 type:"number"——而注册的 columnTypes 里
  * 根本没有叫 number 的类型，这个字段一直没生效。
  *
- * 数量型数值列真正该有的是右对齐：位数对齐了才能一眼比大小。只有 calculateType 为真
- * （可求和的数量型）才右对齐；用 valueEnum 表示分类的数值列（状态码之类）不动。
+ * 普通数值列右对齐；合计另由 calculateType 显式控制。
+ * 用 valueEnum 表示分类的数值列（状态码之类）不动。
  *
  * @author nokecy
  */
 export function toColumnType(dataType) {
   if (!dataType) return {};
-  if (dataType.type === 'number' && dataType.calculateType) {
-    return {
+  if (dataType.type === 'number' && dataType.calculateType !== false) {
+    return dataType.calculateType ? {
       calculateType: dataType.calculateType,
       type: 'rightAligned'
+    } : {
+      type: 'rightAligned'
     };
   }
   return {
@@ -107,6 +108,11 @@ export function toColumnType(dataType) {
   };
 }
 
+/** 显式列类型只控制显示方式，不遮蔽数值对齐或显式合计配置。@author nokecy */
+export function mergeInferredColumnType(column, dataType) {
+  return _objectSpread(_objectSpread({}, toColumnType(dataType)), column);
+}
+
 /**
  * 处理枚举列定义 —— **枚举列渲染的唯一实现**。
  *

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

@@ -28,7 +28,7 @@ import Setting from "../ag-grid-plus/setting";
 import { flatConfigToColumnState, flatConfigToGridState } from "../ag-grid-plus/setting/columnGroupUtils";
 
 // AG-Grid v33 主题:行高、单元格居中、去聚焦/选区视觉(编辑态与阅读态共用一份,见 theme.ts)
-import { arrayTableTheme, ARRAY_TABLE_ROW_HEIGHT } from "./theme";
+import { useArrayTableTheme, ARRAY_TABLE_ROW_HEIGHT } from "./theme";
 import { useGridSchemes } from "../ag-grid-plus";
 
 //@ts-ignore
@@ -36,6 +36,7 @@ var ArrayTableInner = observer(function (props) {
   var _addition$props;
   var height = props.height,
     gridKey = props.gridKey;
+  var arrayTableTheme = useArrayTableTheme(true);
 
   // 【新增】运行时验证 gridKey
   if (!gridKey) {

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

@@ -2,10 +2,11 @@ import React from "react";
 import { useField } from "@formily/react";
 import { buildArrayTableColumns, useArrayTableSources } from "./utils";
 import { AgGridPlus } from "../ag-grid-plus";
-import { arrayTablePreviewTheme, ARRAY_TABLE_ROW_HEIGHT } from "./theme";
+import { useArrayTableTheme, ARRAY_TABLE_ROW_HEIGHT } from "./theme";
 //@ts-ignore
 var ArrayTable = function ArrayTable(props) {
   var height = props.height;
+  var arrayTablePreviewTheme = useArrayTableTheme();
   var field = useField();
   var dataSource = Array.isArray(field.value) ? field.value.slice() : [];
   var sources = useArrayTableSources();

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

@@ -4,13 +4,5 @@
  * 只设网格选项会让文字的行盒仍是主题默认行高(29.6-3=26.6px),顶在 37px 的格子上方(偏上约 4.5px)。
  */
 export declare const ARRAY_TABLE_ROW_HEIGHT = 38;
-/** 阅读态主题:共用主题 + 行高 + 单元格居中 */
-export declare const arrayTablePreviewTheme: import("ag-grid-community").Theme<import("ag-grid-community").CoreParams & import("ag-grid-community").ButtonStyleParams & import("ag-grid-community").CheckboxStyleParams & import("ag-grid-community").TabStyleParams & import("ag-grid-community").InputStyleParams & {}>;
-/**
- * 编辑态主题:在阅读态主题上去掉单元格聚焦/选区视觉(行内编辑更干净)。
- *   focusShadow            -> 聚焦光环
- *   rangeSelectionBorder   -> 单格点击形成的 1×1 选区蓝边
- *   rangeSelectionBackground -> 选区淡蓝填充
- * 仅去视觉,不动焦点功能——键盘导航/点击进编辑仍依赖 cell focus。
- */
-export declare const arrayTableTheme: import("ag-grid-community").Theme<import("ag-grid-community").CoreParams & import("ag-grid-community").ButtonStyleParams & import("ag-grid-community").CheckboxStyleParams & import("ag-grid-community").TabStyleParams & import("ag-grid-community").InputStyleParams & {}>;
+/** 根据当前 antd 主题生成编辑态或阅读态明细表格主题。@author nokecy */
+export declare function useArrayTableTheme(editable?: boolean): import("ag-grid-community").Theme<import("ag-grid-community").CoreParams & import("ag-grid-community").ButtonStyleParams & import("ag-grid-community").CheckboxStyleParams & import("ag-grid-community").TabStyleParams & import("ag-grid-community").InputStyleParams & {}>;

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

@@ -4,7 +4,8 @@
  * @author nokecy
  */
 import { createPart } from 'ag-grid-community';
-import { agGridTheme } from "../ag-grid-plus/theme";
+import { useMemo } from 'react';
+import { useAgGridTheme } from "../ag-grid-plus/theme";
 
 /**
  * 行高 38:放得下 32px 高的输入框。网格选项 rowHeight 与主题参数 rowHeight 必须同值——
@@ -25,20 +26,18 @@ var arrayTableCellFit = createPart({
   css: "\n    .ag-cell .ag-cell-wrapper { height: 100%; }\n    .ag-cell .ant-formily-item { margin-bottom: 0; }\n    .ag-cell .ant-formily-item-help { position: absolute; }\n  "
 });
 
-/** 阅读态主题:共用主题 + 行高 + 单元格居中 */
-export var arrayTablePreviewTheme = agGridTheme.withParams({
-  rowHeight: ARRAY_TABLE_ROW_HEIGHT
-}).withPart(arrayTableCellFit);
-
-/**
- * 编辑态主题:在阅读态主题上去掉单元格聚焦/选区视觉(行内编辑更干净)。
- *   focusShadow            -> 聚焦光环
- *   rangeSelectionBorder   -> 单格点击形成的 1×1 选区蓝边
- *   rangeSelectionBackground -> 选区淡蓝填充
- * 仅去视觉,不动焦点功能——键盘导航/点击进编辑仍依赖 cell focus。
- */
-export var arrayTableTheme = arrayTablePreviewTheme.withParams({
-  focusShadow: 'none',
-  rangeSelectionBorderColor: 'transparent',
-  rangeSelectionBackgroundColor: 'transparent'
-});
+/** 根据当前 antd 主题生成编辑态或阅读态明细表格主题。@author nokecy */
+export function useArrayTableTheme() {
+  var editable = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  var agGridTheme = useAgGridTheme();
+  return useMemo(function () {
+    var previewTheme = agGridTheme.withParams({
+      rowHeight: ARRAY_TABLE_ROW_HEIGHT
+    }).withPart(arrayTableCellFit);
+    return editable ? previewTheme.withParams({
+      focusShadow: 'none',
+      rangeSelectionBorderColor: 'transparent',
+      rangeSelectionBackgroundColor: 'transparent'
+    }) : previewTheme;
+  }, [agGridTheme, editable]);
+}