@nokecy/qc-ui 1.1.55 → 1.1.57

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

@@ -86,6 +86,7 @@ function useDeepCompareStable(value) {
   return ref.current;
 }
 function AgGridPlus(props) {
+  var gridTheme = (0, _theme.useAgGridTheme)();
   var style = props.style,
     loadingProps = props.loading,
     gridParams = props.params,
@@ -1320,7 +1321,7 @@ function AgGridPlus(props) {
       }
     }, /*#__PURE__*/_react.default.createElement(_icons.FilterOutlined, null)))) : null].filter(Boolean)
   }), /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, _extends({
-    theme: _theme.agGridTheme
+    theme: gridTheme
   }, rest, {
     localeText: _locale.localeText,
     gridOptions: {

package/dist/cjs/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/cjs/ag-grid-plus/queryForm/index.js

@@ -27,7 +27,7 @@ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructur
 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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } // @author nokecy
 var FormRender = function FormRender(props) {
   var className = props.className,
     gridApi = props.gridApi,
@@ -67,6 +67,7 @@ var FormRender = function FormRender(props) {
       components: {
         QueryForm: _queryForm.default,
         Input: _antdV.Input,
+        Select: _antdV.Select,
         DatePicker: _antdV.DatePicker,
         FormItem: _antdV.FormItem,
         FormGrid: _antdV.FormGrid,

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

@@ -244,6 +244,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 = (0, _theme.useAgGridTheme)();
   var _useState = (0, _react.useState)(items),
     _useState2 = _slicedToArray(_useState, 2),
     localItems = _useState2[0],
@@ -712,7 +713,7 @@ var ColumnConfigTable = function ColumnConfigTable(_ref2) {
       height: scrollY
     }
   }, /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, {
-    theme: _theme.agGridTheme,
+    theme: gridTheme,
     rowData: visibleItems,
     columnDefs: columnDefs,
     getRowId: function getRowId(params) {

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

@@ -57,6 +57,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
     visible = _ref.visible,
     onClose = _ref.onClose,
     onSaveColumnState = _ref.onSaveColumnState;
+  var gridTheme = (0, _theme.useAgGridTheme)();
   // 使用新的集中式方案管理 API（包含状态数据和操作方法）
   var _useGridSchemes = (0, _useSchemeManager.useGridSchemes)(),
     columnSchemes = _useGridSchemes.columnSchemes,
@@ -1254,7 +1255,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       marginTop: 100
     }
   }) : /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, {
-    theme: _theme.agGridTheme,
+    theme: gridTheme,
     localeText: _locale.localeText,
     rowData: filteredSchemes,
     columnDefs: schemeColumnDefs,

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

@@ -58,6 +58,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
   var gridKey = _ref.gridKey,
     visible = _ref.visible,
     onClose = _ref.onClose;
+  var gridTheme = (0, _theme.useAgGridTheme)();
   // 获取方案管理 API
   var _useGridSchemes = (0, _useSchemeManager.useGridSchemes)(),
     querySchemes = _useGridSchemes.querySchemes,
@@ -761,7 +762,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
         }
       }, /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, {
         ref: queryGridRef,
-        theme: _theme.agGridTheme,
+        theme: gridTheme,
         rowData: queryItemsData,
         columnDefs: queryColumnDefs,
         defaultColDef: {
@@ -809,7 +810,7 @@ var QuerySchemeManager = function QuerySchemeManager(_ref) {
         }
       }, /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, {
         ref: schemeGridRef,
-        theme: _theme.agGridTheme,
+        theme: gridTheme,
         rowData: schemes,
         columnDefs: schemeColumnDefs,
         defaultColDef: {

package/dist/cjs/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/cjs/ag-grid-plus/theme.js

@@ -4,7 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.agGridTheme = void 0;
+exports.useAgGridTheme = useAgGridTheme;
 var _agGridCommunity = require("ag-grid-community");
+var _antd = require("antd");
+var _react = require("react");
 /**
  * AG-Grid v33 主题配置
  * 使用 themeQuartz API 替代 CSS 变量方式
@@ -75,4 +78,33 @@ var agGridTheme = exports.agGridTheme = _agGridCommunity.themeQuartz.withParams(
   // 侧边栏配置
   sideBarPanelWidth: 250,
   spacing: 6
-});
+});
+
+/**
+ * 根据当前 Ant Design ConfigProvider 主题生成 AgGrid 主题色。
+ * 复选框、行选中和悬停等强调状态与 antd 主色同步。@author nokecy
+ */
+function useAgGridTheme() {
+  var _antdTheme$useToken = _antd.theme.useToken(),
+    token = _antdTheme$useToken.token;
+  return (0, _react.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/cjs/ag-grid-plus/toolBar/index.js

@@ -84,11 +84,7 @@ var ListToolBar = function ListToolBar(_ref) {
       return null;
     }
     return /*#__PURE__*/_react.default.createElement("div", {
-      style: {
-        display: 'flex',
-        alignItems: 'center',
-        gap: 8
-      }
+      className: "".concat(prefixCls, "-actions ").concat(hashId)
     }, actions.map(function (action, index) {
       if (! /*#__PURE__*/_react.default.isValidElement(action)) {
         // eslint-disable-next-line react/no-array-index-key
@@ -101,7 +97,7 @@ var ListToolBar = function ListToolBar(_ref) {
         key: index
       }, action === null || action === void 0 ? void 0 : action.props));
     }));
-  }, [actions]);
+  }, [actions, hashId, prefixCls]);
   var hasRight = (0, _react.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/cjs/ag-grid-plus/toolBar/style.js

@@ -17,6 +17,8 @@ var genProListStyle = function genProListStyle(token) {
     "&-container": {
       display: "flex",
       justifyContent: "space-between",
+      alignItems: "center",
+      minWidth: 0,
       paddingBlock: 8,
       //token.padding,
       paddingInline: 0,
@@ -54,29 +56,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"
@@ -127,6 +147,9 @@ var genProListStyle = function genProListStyle(token) {
     "&-left": {
       marginBlockEnd: "8px",
       maxWidth: "100%"
+    },
+    "&-right": {
+      width: "100%"
     }
   })));
 };

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

@@ -40,6 +40,7 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
   var _addition$props;
   var height = props.height,
     gridKey = props.gridKey;
+  var arrayTableTheme = (0, _theme.useArrayTableTheme)(true);
 
   // 【新增】运行时验证 gridKey
   if (!gridKey) {
@@ -330,7 +331,7 @@ var ArrayTableInner = (0, _react2.observer)(function (props) {
       minHeight: 0
     }
   }, /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, {
-    theme: _theme.arrayTableTheme,
+    theme: arrayTableTheme,
     context: gridContext,
     onGridReady: function onGridReady(params) {
       params.api.hidePopupMenu();

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

@@ -13,6 +13,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 //@ts-ignore
 var ArrayTable = function ArrayTable(props) {
   var height = props.height;
+  var arrayTablePreviewTheme = (0, _theme.useArrayTableTheme)();
   var field = (0, _react2.useField)();
   var dataSource = Array.isArray(field.value) ? field.value.slice() : [];
   var sources = (0, _utils.useArrayTableSources)();
@@ -32,7 +33,7 @@ var ArrayTable = function ArrayTable(props) {
     },
     hideTool: true,
     search: false,
-    theme: _theme.arrayTablePreviewTheme,
+    theme: arrayTablePreviewTheme,
     rowHeight: _theme.ARRAY_TABLE_ROW_HEIGHT,
     pagination: false,
     columnDefs: columns,

package/dist/cjs/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/cjs/array-table/theme.js

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.arrayTableTheme = exports.arrayTablePreviewTheme = exports.ARRAY_TABLE_ROW_HEIGHT = void 0;
+exports.ARRAY_TABLE_ROW_HEIGHT = void 0;
+exports.useArrayTableTheme = useArrayTableTheme;
 var _agGridCommunity = require("ag-grid-community");
+var _react = require("react");
 var _theme = require("../ag-grid-plus/theme");
 /**
  * ArrayTable(明细表格)的 AG-Grid 主题:编辑态(index.tsx)与阅读态(preview.tsx)共用。
@@ -31,20 +33,18 @@ var arrayTableCellFit = (0, _agGridCommunity.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  "
 });
 
-/** 阅读态主题:共用主题 + 行高 + 单元格居中 */
-var arrayTablePreviewTheme = exports.arrayTablePreviewTheme = _theme.agGridTheme.withParams({
-  rowHeight: ARRAY_TABLE_ROW_HEIGHT
-}).withPart(arrayTableCellFit);
-
-/**
- * 编辑态主题:在阅读态主题上去掉单元格聚焦/选区视觉(行内编辑更干净)。
- *   focusShadow            -> 聚焦光环
- *   rangeSelectionBorder   -> 单格点击形成的 1×1 选区蓝边
- *   rangeSelectionBackground -> 选区淡蓝填充
- * 仅去视觉,不动焦点功能——键盘导航/点击进编辑仍依赖 cell focus。
- */
-var arrayTableTheme = exports.arrayTableTheme = arrayTablePreviewTheme.withParams({
-  focusShadow: 'none',
-  rangeSelectionBorderColor: 'transparent',
-  rangeSelectionBackgroundColor: 'transparent'
-});
+/** 根据当前 antd 主题生成编辑态或阅读态明细表格主题。@author nokecy */
+function useArrayTableTheme() {
+  var editable = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  var agGridTheme = (0, _theme.useAgGridTheme)();
+  return (0, _react.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]);
+}

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";
@@ -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,
@@ -1312,7 +1313,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: {

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/queryForm/index.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
-import { DatePicker, FormButtonGroup, FormGrid, FormItem, Form, Input, Submit } from '@formily/antd-v5';
+import { DatePicker, FormButtonGroup, FormGrid, FormItem, Form, Input, Select, Submit } from '@formily/antd-v5'; // @author nokecy
 import { createForm } from '@formily/core';
 import { onFieldInit } from '@formily/core';
 import { createSchemaField } from '@formily/react';
@@ -59,6 +59,7 @@ var FormRender = function FormRender(props) {
       components: {
         QueryForm: QueryForm,
         Input: Input,
+        Select: Select,
         DatePicker: DatePicker,
         FormItem: FormItem,
         FormGrid: FormGrid,

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]);