@nokecy/qc-ui 1.1.58 → 1.1.60

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

@@ -885,6 +885,10 @@ function AgGridPlus(props) {
       onRetry: onRefresh
     };
   }, [loadError, accessible, filtered, overlayNoRowsTemplateText, emptyState, onRefresh]);
+  // 调用方自带空态浮层时让位，见 resolveNoRowsOverlay。@author nokecy
+  var noRowsOverlay = (0, _react.useMemo)(function () {
+    return (0, _emptyState.resolveNoRowsOverlay)(_NoRowsOverlay.default, noRowsOverlayParams, rest.noRowsOverlayComponent, rest.noRowsOverlayComponentParams);
+  }, [noRowsOverlayParams, rest.noRowsOverlayComponent, rest.noRowsOverlayComponentParams]);
   (0, _react.useEffect)(function () {
     gridRef.current = {
       onRefresh: onRefresh
@@ -1323,8 +1327,8 @@ function AgGridPlus(props) {
       ensureDomOrder: true,
       columnHoverHighlight: true
     },
-    noRowsOverlayComponent: _NoRowsOverlay.default,
-    noRowsOverlayComponentParams: noRowsOverlayParams
+    noRowsOverlayComponent: noRowsOverlay.component,
+    noRowsOverlayComponentParams: noRowsOverlay.params
     // 加载中不显示空态：外层 Spin 已经在转，再叠一句「暂无数据」会让用户
     // 以为真的没数据（冒烟截图里这两者确实同时出现过）。@author nokecy
     ,

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

@@ -48,3 +48,9 @@
 .custom-cell-right {
   text-align: right !important;
 }
+
+// 空态浮层里的「重试」「新建」「清空筛选」要能点：AG-Grid 给 .ag-overlay 设了 pointer-events: none，
+// 只给加载浮层放开，空态浮层里的按钮因此点不到。只放开可交互元素，空白处仍穿透到表格。@author nokecy
+.ag-overlay-no-rows-wrapper :is(button, a, input, [role='button']) {
+  pointer-events: auto;
+}

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

@@ -11,6 +11,7 @@ var _icons = require("@ant-design/icons");
 var _antdV = require("@formily/antd-v5");
 var _react2 = require("@formily/react");
 var _arrayTable = _interopRequireDefault(require("../../array-table"));
+var _columnGroupUtils = require("./columnGroupUtils");
 var _NameColumnRenderer = _interopRequireDefault(require("./NameColumnRenderer"));
 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); }
@@ -304,7 +305,7 @@ var ColumnConfigForm = function ColumnConfigForm(_ref) {
         return /*#__PURE__*/_react.default.createElement("span", null, "-");
       }
       return /*#__PURE__*/_react.default.createElement(_antdV.Select, {
-        value: props.value || 'custom-cell-left',
+        value: (0, _columnGroupUtils.normalizeCellAlign)(props.value),
         onChange: props.onChange,
         options: [{
           value: 'custom-cell-left',

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

@@ -178,7 +178,7 @@ var AlignmentCellRenderer = function AlignmentCellRenderer(props) {
   if (!item || item.type !== 'column') return /*#__PURE__*/_react.default.createElement("span", null, "-");
 
   // 标准化 cellClass 值，默认为左对齐
-  var normalizedValue = item.cellClass || 'custom-cell-left';
+  var normalizedValue = (0, _columnGroupUtils.normalizeCellAlign)(item.cellClass);
   return /*#__PURE__*/_react.default.createElement(_antd.Select, {
     value: normalizedValue,
     onChange: function onChange(val) {

package/dist/cjs/ag-grid-plus/setting/ColumnSetting.d.ts

@@ -6,6 +6,11 @@ interface ColumnSettingProps {
     visible: boolean;
     onClose: () => void;
     onSaveColumnState: (state: any) => void;
+    /**
+     * 调用方自带的原始列定义（含 cellRenderer 等），优先于 Context。
+     * ArrayTable 不在 AgGridPlus 的 Context 里，不传会导致保存后重建出裸列、单元格空白。@author nokecy
+     */
+    allColDefs?: any[];
 }
 /**
  * 列方案管理组件 - 集成列配置和列方案管理

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

@@ -56,14 +56,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
     gridApi = _ref.gridApi,
     visible = _ref.visible,
     onClose = _ref.onClose,
-    onSaveColumnState = _ref.onSaveColumnState;
+    onSaveColumnState = _ref.onSaveColumnState,
+    allColDefsProp = _ref.allColDefs;
   var gridTheme = (0, _theme.useAgGridTheme)();
   // 使用新的集中式方案管理 API（包含状态数据和操作方法）
   var _useGridSchemes = (0, _useSchemeManager.useGridSchemes)(),
     columnSchemes = _useGridSchemes.columnSchemes,
     currentSchemes = _useGridSchemes.currentSchemes,
-    allColDefs = _useGridSchemes.allColDefs,
-    initialColumnDefs = _useGridSchemes.initialColumnDefs,
+    contextAllColDefs = _useGridSchemes.allColDefs,
+    contextInitialColumnDefs = _useGridSchemes.initialColumnDefs,
     saveColumnScheme = _useGridSchemes.saveColumnScheme,
     deleteColumnScheme = _useGridSchemes.deleteColumnScheme,
     setCurrentColumnScheme = _useGridSchemes.setCurrentColumnScheme,
@@ -73,6 +74,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
     globalConfigPermissions = _useGridSchemes.globalConfigPermissions,
     isUsingGlobalFallback = _useGridSchemes.isUsingGlobalFallback;
 
+  // 调用方传入的列定义优先：Context 里的属于外层 AgGridPlus 或为空 @author nokecy
+  var allColDefs = allColDefsProp !== null && allColDefsProp !== void 0 ? allColDefsProp : contextAllColDefs;
+  var initialColumnDefs = allColDefsProp !== null && allColDefsProp !== void 0 ? allColDefsProp : contextInitialColumnDefs;
+
   // 解构权限信息
   var canApplyToGlobal = (_globalConfigPermissi = globalConfigPermissions === null || globalConfigPermissions === void 0 ? void 0 : globalConfigPermissions.canApplyToGlobal) !== null && _globalConfigPermissi !== void 0 ? _globalConfigPermissi : false;
   var canResetAllUsers = (_globalConfigPermissi2 = globalConfigPermissions === null || globalConfigPermissions === void 0 ? void 0 : globalConfigPermissions.canResetAllUsers) !== null && _globalConfigPermissi2 !== void 0 ? _globalConfigPermissi2 : false;

package/dist/cjs/ag-grid-plus/setting/columnGroupUtils.d.ts

@@ -95,3 +95,9 @@ export declare function isOldSchemeData(data: any[]): boolean;
  * @returns AG-Grid columnState 数组
  */
 export declare function flatConfigToColumnState(flatConfig: FlatColumnItem[], originalColumnDefs?: (ColDef | ColGroupDef)[]): any[];
+/**
+ * 把列上的 cellClass 归一为对齐下拉的三个选项值。
+ * 列定义里可能是 AG-Grid 数值类型自带的 ag-right-aligned-cell、ArrayTable 的 ag-cell-right 等，
+ * 下拉只认 custom-cell-*，不归一就会把原始类名直接显示出来。@author nokecy
+ */
+export declare function normalizeCellAlign(cellClass: unknown): 'custom-cell-left' | 'custom-cell-centered' | 'custom-cell-right';

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

@@ -13,6 +13,7 @@ exports.generateId = void 0;
 exports.gridStateToFlatConfig = gridStateToFlatConfig;
 exports.isOldSchemeData = isOldSchemeData;
 exports.migrateOldScheme = migrateOldScheme;
+exports.normalizeCellAlign = normalizeCellAlign;
 exports.reorderItems = reorderItems;
 var _lodash = require("lodash");
 var _logger = require("../utils/logger");
@@ -629,4 +630,16 @@ function flatConfigToColumnState(flatConfig, originalColumnDefs) {
     }
   }
   return result;
+}
+
+/**
+ * 把列上的 cellClass 归一为对齐下拉的三个选项值。
+ * 列定义里可能是 AG-Grid 数值类型自带的 ag-right-aligned-cell、ArrayTable 的 ag-cell-right 等，
+ * 下拉只认 custom-cell-*，不归一就会把原始类名直接显示出来。@author nokecy
+ */
+function normalizeCellAlign(cellClass) {
+  var text = Array.isArray(cellClass) ? cellClass.join(' ') : typeof cellClass === 'string' ? cellClass : '';
+  if (/right/.test(text)) return 'custom-cell-right';
+  if (/cent/.test(text)) return 'custom-cell-centered';
+  return 'custom-cell-left';
 }

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

@@ -26,6 +26,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var Setting = function Setting(props) {
   var gridKey = props.gridKey,
     gridApi = props.gridApi,
+    allColDefs = props.allColDefs,
     onSaveColumnState = props.onSaveColumnState,
     _props$showQuerySchem = props.showQueryScheme,
     showQueryScheme = _props$showQuerySchem === void 0 ? true : _props$showQuerySchem;
@@ -78,7 +79,8 @@ var Setting = function Setting(props) {
     onClose: function onClose() {
       return setColumnSettingVisible(false);
     },
-    onSaveColumnState: onSaveColumnState || function () {}
+    onSaveColumnState: onSaveColumnState || function () {},
+    allColDefs: allColDefs
   }), gridKey && showQueryScheme && /*#__PURE__*/_react.default.createElement(_QuerySchemeManager.default, {
     gridKey: gridKey,
     visible: querySchemeVisible,

package/dist/cjs/ag-grid-plus/utils/emptyState.d.ts

@@ -40,3 +40,15 @@ export declare function resolveEmptyText(state: {
     override?: string;
     texts?: EmptyStateTexts;
 }): string;
+/**
+ * 选出空态浮层组件及其入参。
+ * 调用方传了 `noRowsOverlayComponent` 就用调用方的：宿主往往有自己的空态（例如无数据时带「新建」按钮、
+ * 外部筛选栏的「清空筛选」），此前内置浮层写死在 `...rest` 之后，把它们全部覆盖掉了。
+ * 入参合并：内置的 branch / text / onRetry 照样传给自定义组件，调用方同名入参优先。
+ *
+ * @author nokecy
+ */
+export declare function resolveNoRowsOverlay<C, P extends object>(builtIn: C, builtInParams: P, custom?: C | null, customParams?: Record<string, any> | null): {
+    component: C;
+    params: P & Record<string, any>;
+};

package/dist/cjs/ag-grid-plus/utils/emptyState.js

@@ -7,6 +7,12 @@ exports.DEFAULT_EMPTY_TEXTS = void 0;
 exports.hasEffectiveFilter = hasEffectiveFilter;
 exports.resolveEmptyBranch = resolveEmptyBranch;
 exports.resolveEmptyText = resolveEmptyText;
+exports.resolveNoRowsOverlay = resolveNoRowsOverlay;
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _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); }
 /**
  * 表格空态四分。
@@ -74,4 +80,19 @@ function resolveEmptyText(state) {
   if (state.override) return state.override;
   var branch = resolveEmptyBranch(state);
   return (_state$texts$branch = (_state$texts = state.texts) === null || _state$texts === void 0 ? void 0 : _state$texts[branch]) !== null && _state$texts$branch !== void 0 ? _state$texts$branch : DEFAULT_EMPTY_TEXTS[branch];
+}
+
+/**
+ * 选出空态浮层组件及其入参。
+ * 调用方传了 `noRowsOverlayComponent` 就用调用方的：宿主往往有自己的空态（例如无数据时带「新建」按钮、
+ * 外部筛选栏的「清空筛选」），此前内置浮层写死在 `...rest` 之后，把它们全部覆盖掉了。
+ * 入参合并：内置的 branch / text / onRetry 照样传给自定义组件，调用方同名入参优先。
+ *
+ * @author nokecy
+ */
+function resolveNoRowsOverlay(builtIn, builtInParams, custom, customParams) {
+  return {
+    component: custom !== null && custom !== void 0 ? custom : builtIn,
+    params: customParams ? _objectSpread(_objectSpread({}, builtInParams), customParams) : builtInParams
+  };
 }

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

@@ -46,7 +46,7 @@ import _, { isArray } from 'lodash';
 import CustomGroupCellRenderer from "./_utils/customGroupCellRenderer";
 import NoRowsOverlay from "./shared/NoRowsOverlay";
 import { DEFAULT_PAGE_SIZE_OPTIONS } from "./utils/constants";
-import { hasEffectiveFilter, resolveEmptyBranch, resolveEmptyText } from "./utils/emptyState";
+import { hasEffectiveFilter, resolveEmptyBranch, resolveEmptyText, resolveNoRowsOverlay } from "./utils/emptyState";
 import processColumnGroups from "./_utils/processColumnGroups";
 import flattenColumnState from "./_utils/processFormColumnState";
 import { localeText } from "./locale";
@@ -877,6 +877,10 @@ function AgGridPlus(props) {
       onRetry: onRefresh
     };
   }, [loadError, accessible, filtered, overlayNoRowsTemplateText, emptyState, onRefresh]);
+  // 调用方自带空态浮层时让位，见 resolveNoRowsOverlay。@author nokecy
+  var noRowsOverlay = useMemo(function () {
+    return resolveNoRowsOverlay(NoRowsOverlay, noRowsOverlayParams, rest.noRowsOverlayComponent, rest.noRowsOverlayComponentParams);
+  }, [noRowsOverlayParams, rest.noRowsOverlayComponent, rest.noRowsOverlayComponentParams]);
   useEffect(function () {
     gridRef.current = {
       onRefresh: onRefresh
@@ -1315,8 +1319,8 @@ function AgGridPlus(props) {
       ensureDomOrder: true,
       columnHoverHighlight: true
     },
-    noRowsOverlayComponent: NoRowsOverlay,
-    noRowsOverlayComponentParams: noRowsOverlayParams
+    noRowsOverlayComponent: noRowsOverlay.component,
+    noRowsOverlayComponentParams: noRowsOverlay.params
     // 加载中不显示空态：外层 Spin 已经在转，再叠一句「暂无数据」会让用户
     // 以为真的没数据（冒烟截图里这两者确实同时出现过）。@author nokecy
     ,

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

@@ -48,3 +48,9 @@
 .custom-cell-right {
   text-align: right !important;
 }
+
+// 空态浮层里的「重试」「新建」「清空筛选」要能点：AG-Grid 给 .ag-overlay 设了 pointer-events: none，
+// 只给加载浮层放开，空态浮层里的按钮因此点不到。只放开可交互元素，空白处仍穿透到表格。@author nokecy
+.ag-overlay-no-rows-wrapper :is(button, a, input, [role='button']) {
+  pointer-events: auto;
+}

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

@@ -10,6 +10,7 @@ import { DeleteOutlined, HolderOutlined } from '@ant-design/icons';
 import { FormGrid, FormItem, FormLayout, Input, Select, NumberPicker, Switch } from '@formily/antd-v5';
 import { createSchemaField } from '@formily/react';
 import ArrayTable from "../../array-table";
+import { normalizeCellAlign } from "./columnGroupUtils";
 import NameColumnRenderer from "./NameColumnRenderer";
 var SchemaField = createSchemaField({
   components: {
@@ -294,7 +295,7 @@ var ColumnConfigForm = function ColumnConfigForm(_ref) {
         return /*#__PURE__*/React.createElement("span", null, "-");
       }
       return /*#__PURE__*/React.createElement(Select, {
-        value: props.value || 'custom-cell-left',
+        value: normalizeCellAlign(props.value),
         onChange: props.onChange,
         options: [{
           value: 'custom-cell-left',

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

@@ -23,7 +23,7 @@ import React, { useCallback, useMemo, useState, useRef, useEffect } from 'react'
 import { Button, Select, Switch, Space, Popconfirm, message, Tag } from 'antd';
 import { DeleteOutlined, FolderOutlined, FolderAddOutlined, FileOutlined } from '@ant-design/icons';
 import { AgGridReact } from 'ag-grid-react';
-import { generateId } from "./columnGroupUtils";
+import { generateId, normalizeCellAlign } from "./columnGroupUtils";
 import { DebounceNumberInput } from "./DebounceInputs";
 import { useAgGridTheme } from "../theme";
 import { ColumnNameCellRenderer } from "./ColumnNameCellRenderer";
@@ -172,7 +172,7 @@ var AlignmentCellRenderer = function AlignmentCellRenderer(props) {
   if (!item || item.type !== 'column') return /*#__PURE__*/React.createElement("span", null, "-");
 
   // 标准化 cellClass 值，默认为左对齐
-  var normalizedValue = item.cellClass || 'custom-cell-left';
+  var normalizedValue = normalizeCellAlign(item.cellClass);
   return /*#__PURE__*/React.createElement(Select, {
     value: normalizedValue,
     onChange: function onChange(val) {

package/dist/esm/ag-grid-plus/setting/ColumnSetting.d.ts

@@ -6,6 +6,11 @@ interface ColumnSettingProps {
     visible: boolean;
     onClose: () => void;
     onSaveColumnState: (state: any) => void;
+    /**
+     * 调用方自带的原始列定义（含 cellRenderer 等），优先于 Context。
+     * ArrayTable 不在 AgGridPlus 的 Context 里，不传会导致保存后重建出裸列、单元格空白。@author nokecy
+     */
+    allColDefs?: any[];
 }
 /**
  * 列方案管理组件 - 集成列配置和列方案管理

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

@@ -49,14 +49,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
     gridApi = _ref.gridApi,
     visible = _ref.visible,
     onClose = _ref.onClose,
-    onSaveColumnState = _ref.onSaveColumnState;
+    onSaveColumnState = _ref.onSaveColumnState,
+    allColDefsProp = _ref.allColDefs;
   var gridTheme = useAgGridTheme();
   // 使用新的集中式方案管理 API（包含状态数据和操作方法）
   var _useGridSchemes = useGridSchemes(),
     columnSchemes = _useGridSchemes.columnSchemes,
     currentSchemes = _useGridSchemes.currentSchemes,
-    allColDefs = _useGridSchemes.allColDefs,
-    initialColumnDefs = _useGridSchemes.initialColumnDefs,
+    contextAllColDefs = _useGridSchemes.allColDefs,
+    contextInitialColumnDefs = _useGridSchemes.initialColumnDefs,
     saveColumnScheme = _useGridSchemes.saveColumnScheme,
     deleteColumnScheme = _useGridSchemes.deleteColumnScheme,
     setCurrentColumnScheme = _useGridSchemes.setCurrentColumnScheme,
@@ -66,6 +67,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
     globalConfigPermissions = _useGridSchemes.globalConfigPermissions,
     isUsingGlobalFallback = _useGridSchemes.isUsingGlobalFallback;
 
+  // 调用方传入的列定义优先：Context 里的属于外层 AgGridPlus 或为空 @author nokecy
+  var allColDefs = allColDefsProp !== null && allColDefsProp !== void 0 ? allColDefsProp : contextAllColDefs;
+  var initialColumnDefs = allColDefsProp !== null && allColDefsProp !== void 0 ? allColDefsProp : contextInitialColumnDefs;
+
   // 解构权限信息
   var canApplyToGlobal = (_globalConfigPermissi = globalConfigPermissions === null || globalConfigPermissions === void 0 ? void 0 : globalConfigPermissions.canApplyToGlobal) !== null && _globalConfigPermissi !== void 0 ? _globalConfigPermissi : false;
   var canResetAllUsers = (_globalConfigPermissi2 = globalConfigPermissions === null || globalConfigPermissions === void 0 ? void 0 : globalConfigPermissions.canResetAllUsers) !== null && _globalConfigPermissi2 !== void 0 ? _globalConfigPermissi2 : false;

package/dist/esm/ag-grid-plus/setting/columnGroupUtils.d.ts

@@ -95,3 +95,9 @@ export declare function isOldSchemeData(data: any[]): boolean;
  * @returns AG-Grid columnState 数组
  */
 export declare function flatConfigToColumnState(flatConfig: FlatColumnItem[], originalColumnDefs?: (ColDef | ColGroupDef)[]): any[];
+/**
+ * 把列上的 cellClass 归一为对齐下拉的三个选项值。
+ * 列定义里可能是 AG-Grid 数值类型自带的 ag-right-aligned-cell、ArrayTable 的 ag-cell-right 等，
+ * 下拉只认 custom-cell-*，不归一就会把原始类名直接显示出来。@author nokecy
+ */
+export declare function normalizeCellAlign(cellClass: unknown): 'custom-cell-left' | 'custom-cell-centered' | 'custom-cell-right';

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

@@ -615,4 +615,16 @@ export function flatConfigToColumnState(flatConfig, originalColumnDefs) {
     }
   }
   return result;
+}
+
+/**
+ * 把列上的 cellClass 归一为对齐下拉的三个选项值。
+ * 列定义里可能是 AG-Grid 数值类型自带的 ag-right-aligned-cell、ArrayTable 的 ag-cell-right 等，
+ * 下拉只认 custom-cell-*，不归一就会把原始类名直接显示出来。@author nokecy
+ */
+export function normalizeCellAlign(cellClass) {
+  var text = Array.isArray(cellClass) ? cellClass.join(' ') : typeof cellClass === 'string' ? cellClass : '';
+  if (/right/.test(text)) return 'custom-cell-right';
+  if (/cent/.test(text)) return 'custom-cell-centered';
+  return 'custom-cell-left';
 }

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

@@ -16,6 +16,7 @@ import QuerySchemeManager from "./QuerySchemeManager";
 var Setting = function Setting(props) {
   var gridKey = props.gridKey,
     gridApi = props.gridApi,
+    allColDefs = props.allColDefs,
     onSaveColumnState = props.onSaveColumnState,
     _props$showQuerySchem = props.showQueryScheme,
     showQueryScheme = _props$showQuerySchem === void 0 ? true : _props$showQuerySchem;
@@ -68,7 +69,8 @@ var Setting = function Setting(props) {
     onClose: function onClose() {
       return setColumnSettingVisible(false);
     },
-    onSaveColumnState: onSaveColumnState || function () {}
+    onSaveColumnState: onSaveColumnState || function () {},
+    allColDefs: allColDefs
   }), gridKey && showQueryScheme && /*#__PURE__*/React.createElement(QuerySchemeManager, {
     gridKey: gridKey,
     visible: querySchemeVisible,

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

@@ -40,3 +40,15 @@ export declare function resolveEmptyText(state: {
     override?: string;
     texts?: EmptyStateTexts;
 }): string;
+/**
+ * 选出空态浮层组件及其入参。
+ * 调用方传了 `noRowsOverlayComponent` 就用调用方的：宿主往往有自己的空态（例如无数据时带「新建」按钮、
+ * 外部筛选栏的「清空筛选」），此前内置浮层写死在 `...rest` 之后，把它们全部覆盖掉了。
+ * 入参合并：内置的 branch / text / onRetry 照样传给自定义组件，调用方同名入参优先。
+ *
+ * @author nokecy
+ */
+export declare function resolveNoRowsOverlay<C, P extends object>(builtIn: C, builtInParams: P, custom?: C | null, customParams?: Record<string, any> | null): {
+    component: C;
+    params: P & Record<string, any>;
+};

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

@@ -1,3 +1,8 @@
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _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); }
 /**
  * 表格空态四分。
@@ -65,4 +70,19 @@ export function resolveEmptyText(state) {
   if (state.override) return state.override;
   var branch = resolveEmptyBranch(state);
   return (_state$texts$branch = (_state$texts = state.texts) === null || _state$texts === void 0 ? void 0 : _state$texts[branch]) !== null && _state$texts$branch !== void 0 ? _state$texts$branch : DEFAULT_EMPTY_TEXTS[branch];
+}
+
+/**
+ * 选出空态浮层组件及其入参。
+ * 调用方传了 `noRowsOverlayComponent` 就用调用方的：宿主往往有自己的空态（例如无数据时带「新建」按钮、
+ * 外部筛选栏的「清空筛选」），此前内置浮层写死在 `...rest` 之后，把它们全部覆盖掉了。
+ * 入参合并：内置的 branch / text / onRetry 照样传给自定义组件，调用方同名入参优先。
+ *
+ * @author nokecy
+ */
+export function resolveNoRowsOverlay(builtIn, builtInParams, custom, customParams) {
+  return {
+    component: custom !== null && custom !== void 0 ? custom : builtIn,
+    params: customParams ? _objectSpread(_objectSpread({}, builtInParams), customParams) : builtInParams
+  };
 }