@pisell/materials 1.0.1039 → 1.0.1041

package/es/components/PisellCards/index.d.ts

@@ -7,15 +7,15 @@ import "./components/PisellImageCard/index.js";
 import { BadgeConfig, TabCardProps } from "./components/TabCard/types.js";
 import "./components/TextCard/types.js";
 import { MultilevelCardProps } from "./components/MultilevelCard/types.js";
-import * as react12 from "react";
+import * as react11 from "react";
 
 //#region src/components/PisellCards/index.d.ts
 declare const PisellCards: {
-  TabCard: (props: any) => react12.JSX.Element;
-  TextCard: (props: any) => react12.JSX.Element;
-  GraphicTextCard: (props: GraphicTextCardProps) => react12.JSX.Element;
-  MultilevelCard: (props: any) => react12.JSX.Element;
-  PisellImageCard: (props: PisellImageCardProps) => react12.JSX.Element;
+  TabCard: (props: any) => react11.JSX.Element;
+  TextCard: (props: any) => react11.JSX.Element;
+  GraphicTextCard: (props: GraphicTextCardProps) => react11.JSX.Element;
+  MultilevelCard: (props: any) => react11.JSX.Element;
+  PisellImageCard: (props: PisellImageCardProps) => react11.JSX.Element;
 };
 //#endregion
 export { PisellCards };

package/es/components/dataSourceComponents/fields/Input.Email/index.d.ts

@@ -1,9 +1,9 @@
 import { WithFormItemProps, WithModeProps } from "../../dataSourceForm/utils.js";
-import * as antd18 from "antd";
+import * as antd21 from "antd";
 import React from "react";
 
 //#region src/components/dataSourceComponents/fields/Input.Email/index.d.ts
-declare const Email: React.FC<antd18.InputProps & {
+declare const Email: React.FC<antd21.InputProps & {
   onChange: (value: string) => void;
 } & WithModeProps & WithFormItemProps>;
 //#endregion

package/es/components/dataSourceComponents/fields/Input.Password/index.d.ts

@@ -1,9 +1,9 @@
 import { WithFormItemProps, WithModeProps } from "../../dataSourceForm/utils.js";
-import * as antd22 from "antd";
+import * as antd18 from "antd";
 import React from "react";
-import * as antd_es_input4 from "antd/es/input";
+import * as antd_es_input3 from "antd/es/input";
 
 //#region src/components/dataSourceComponents/fields/Input.Password/index.d.ts
-declare const Password: React.FC<antd_es_input4.PasswordProps & React.RefAttributes<antd22.InputRef> & WithModeProps & WithFormItemProps>;
+declare const Password: React.FC<antd_es_input3.PasswordProps & React.RefAttributes<antd18.InputRef> & WithModeProps & WithFormItemProps>;
 //#endregion
 export { Password };

package/es/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -1,9 +1,9 @@
 import { WithFormItemProps, WithModeProps } from "../../dataSourceForm/utils.js";
-import * as antd21 from "antd";
+import * as antd22 from "antd";
 import React from "react";
 
 //#region src/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts
-declare const Subdomain: React.FC<antd21.InputProps & {
+declare const Subdomain: React.FC<antd22.InputProps & {
   onChange: (value: string) => void;
   onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
   rootDomain: "custom" | "saas" | "xzero";

package/es/components/dataSourceComponents/fields/Input.TextArea/index.d.ts

@@ -1,9 +1,9 @@
 import { WithFormItemProps, WithModeProps } from "../../dataSourceForm/utils.js";
 import React from "react";
-import * as antd_es_input3 from "antd/es/input";
+import * as antd_es_input4 from "antd/es/input";
 import * as antd_es_input_TextArea0 from "antd/es/input/TextArea";
 
 //#region src/components/dataSourceComponents/fields/Input.TextArea/index.d.ts
-declare const TextArea: React.FC<antd_es_input3.TextAreaProps & React.RefAttributes<antd_es_input_TextArea0.TextAreaRef> & WithModeProps & WithFormItemProps>;
+declare const TextArea: React.FC<antd_es_input4.TextAreaProps & React.RefAttributes<antd_es_input_TextArea0.TextAreaRef> & WithModeProps & WithFormItemProps>;
 //#endregion
 export { TextArea };

package/es/components/dataSourceComponents/fields/Select/index.d.ts

@@ -1,10 +1,10 @@
 import { WithFormItemProps, WithModeProps } from "../../dataSourceForm/utils.js";
-import * as antd0 from "antd";
+import * as antd15 from "antd";
 import React from "react";
 import * as antd_es_select0 from "antd/es/select";
 
 //#region src/components/dataSourceComponents/fields/Select/index.d.ts
-declare const SelectWithDataSource: (props: antd0.SelectProps<any, antd_es_select0.DefaultOptionType> & WithModeProps & WithFormItemProps & {
+declare const SelectWithDataSource: (props: antd15.SelectProps<any, antd_es_select0.DefaultOptionType> & WithModeProps & WithFormItemProps & {
   options?: any;
   optionSourceType?: "custom" | "default" | "api" | undefined;
   labelField: string;

package/es/components/dataSourceComponents/fields/Switch/index.d.ts

@@ -1,8 +1,8 @@
 import { WithFormItemProps, WithModeProps } from "../../dataSourceForm/utils.js";
-import * as antd0 from "antd";
+import * as antd14 from "antd";
 import React from "react";
 
 //#region src/components/dataSourceComponents/fields/Switch/index.d.ts
-declare const Switch$1: React.FC<antd0.SwitchProps & React.RefAttributes<HTMLElement> & WithModeProps & WithFormItemProps>;
+declare const Switch$1: React.FC<antd14.SwitchProps & React.RefAttributes<HTMLElement> & WithModeProps & WithFormItemProps>;
 //#endregion
 export { Switch$1 as Switch };

package/es/components/filter/components/FilterItem/index.js

@@ -81,7 +81,7 @@ const FilterItem = (props) => {
 			hidden: isHidden
 		}, (other === null || other === void 0 ? void 0 : other.formItemProps) || {}), /* @__PURE__ */ React.createElement(CustomComponent, componentProps$1));
 	}
-	if (type === "rangePicker") {
+	if (type === "rangePickerNew") {
 		const componentProps$1 = _objectSpread2(_objectSpread2(_objectSpread2({}, itemProps || {}), other || {}), {}, { prefixCls: "pisell-lowcode" });
 		return /* @__PURE__ */ React.createElement(Form.Item, _objectSpread2(_objectSpread2({
 			label,

package/es/components/filter/components/FilterItem/index.less

@@ -11,10 +11,10 @@
  */
 
 .pisell-lowcode-range-picker-wrap {
-  width: 257px;
+  //width: 257px;
+  width: 100%;
 
   .pisell-lowcode-range {
-    font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
     font-size: 16px;
     font-weight: 400;
     line-height: 24px;

package/es/components/filter/types.d.ts

@@ -19,7 +19,7 @@ type FilterType = {
  * - type 为 "custom" 时使用 other.component，组件接收 value/onChange（由 Form 注入）
  */
 type FilterItemProps = {
-  type: "single" | "input" | "datePicker" | "rangePicker" | "search" | "custom";
+  type: "single" | "input" | "datePicker" | "rangePicker" | "rangePickerNew" | "search" | "custom";
   name?: string | string[];
   key: string;
   props?: object;

package/es/components/pisellDatePicker/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import * as react31 from "react";
+import * as react16 from "react";
 
 //#region src/components/pisellDatePicker/index.d.ts
-declare const PisellDatePicker: (props: any) => react31.JSX.Element;
+declare const PisellDatePicker: (props: any) => react16.JSX.Element;
 //#endregion
 export { PisellDatePicker };

package/es/components/pisellLookup/PisellLookup.less

@@ -133,7 +133,9 @@
   // ============ Input 样式覆盖 ============
 
   // 覆盖 Ant Design Input 默认样式（适用于所有尺寸）；默认高度 50px
-  &-trigger-input.pisell-lowcode-input-affix-wrapper {
+  // 同时匹配 ant- / pisell-lowcode- 前缀，确保有无 prefixCls 都能生效
+  &-trigger-input.pisell-lowcode-input-affix-wrapper,
+  &-trigger-input.ant-input-affix-wrapper {
     min-height: 50px;
     border: 1px solid #d0d5dd;
     border-radius: 8px;
@@ -146,13 +148,15 @@
     }
 
     &:focus,
-    &.pisell-lowcode-input-affix-wrapper-focused {
+    &.pisell-lowcode-input-affix-wrapper-focused,
+    &.ant-input-affix-wrapper-focused {
       border-color: #7f56d9;
       box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05), 0 0 0 2px rgba(127, 86, 217, 0.1);
     }
 
-    // Input 文本样式
-    .pisell-lowcode-input {
+    // Input 文本样式（antd 内部 input 类名可能为 .ant-input 或 .pisell-lowcode-input）
+    .pisell-lowcode-input,
+    .ant-input {
       color: #000000;
       font-size: 16px;
       line-height: 24px;
@@ -165,8 +169,9 @@
     }
   }
 
-  // 小号输入框
-  &-trigger-input.pisell-lowcode-input-affix-wrapper-sm {
+  // 小号输入框（同时匹配 ant- / pisell-lowcode-）
+  &-trigger-input.pisell-lowcode-input-affix-wrapper-sm,
+  &-trigger-input.ant-input-affix-wrapper-sm {
     padding: 2px 2px 2px 12px;
 
     .pisell-lookup-input-clear {
@@ -193,8 +198,9 @@
     }
   }
 
-  // 大号输入框，高度 58px
-  &-trigger-input.pisell-lowcode-input-affix-wrapper-lg {
+  // 大号输入框，高度 58px（同时匹配 ant- / pisell-lowcode-）
+  &-trigger-input.pisell-lowcode-input-affix-wrapper-lg,
+  &-trigger-input.ant-input-affix-wrapper-lg {
     min-height: 58px;
     padding: 6px 6px 6px 16px;
 
@@ -213,10 +219,22 @@
     .pisell-lookup-input-confirm {
       padding: 10px;
       line-height: 24px;
+    }
+  }
 
-      span {
-        line-height: 24px;
-      }
+  // 无 Lookup 按钮时：class 在包裹层 .pisell-lookup-trigger-input-no-confirm 上，对子元素 affix-wrapper 设左右对称 padding
+  &-trigger-input-no-confirm {
+    > .ant-input-affix-wrapper,
+    > .pisell-lowcode-input-affix-wrapper {
+      padding: 4px 16px;
+    }
+    > .ant-input-affix-wrapper-sm,
+    > .pisell-lowcode-input-affix-wrapper-sm {
+      padding: 2px 12px;
+    }
+    > .ant-input-affix-wrapper-lg,
+    > .pisell-lowcode-input-affix-wrapper-lg {
+      padding: 6px 16px;
     }
   }
 

package/es/components/pisellLookup/components/LookupTrigger.js

@@ -146,7 +146,7 @@ const LookupTriggerComponent = forwardRef((props, ref) => {
 			onClick: handleConfirm,
 			className: "pisell-lookup-input-confirm"
 		}, confirmButtonText));
-		return /* @__PURE__ */ React.createElement(Input, {
+		const inputEl = /* @__PURE__ */ React.createElement(Input, {
 			ref: inputRef,
 			value,
 			onChange: handleChange,
@@ -159,9 +159,11 @@ const LookupTriggerComponent = forwardRef((props, ref) => {
 			prefix,
 			suffix,
 			autoFocus,
-			className: `pisell-lookup-trigger-input ${className || ""}`,
+			className: `pisell-lookup-trigger-input ${className || ""}`.trim(),
 			style
 		});
+		if (!showConfirmButton) return /* @__PURE__ */ React.createElement("div", { className: "pisell-lookup-trigger-input pisell-lookup-trigger-input-no-confirm" }, inputEl);
+		return inputEl;
 	};
 	/**
 	* 渲染按钮触发器

package/es/components/pisellModal/index.d.ts

@@ -1,7 +1,7 @@
 import { PisellContextType } from "../pisell-config-provider/context.js";
 import { PisellModalFuncProps } from "./components/functions/index.js";
 import { InformationProps } from "./components/Information/index.js";
-import * as antd3 from "antd";
+import * as antd0 from "antd";
 import { ButtonProps, ModalProps } from "antd";
 import React from "react";
 
@@ -39,24 +39,24 @@ declare const PisellModal: {
   (props: PisellModalProps): React.JSX.Element;
   confirm: (props: PisellModalFuncProps) => {
     destroy: () => void;
-    update: (configUpdate: antd3.ModalFuncProps | ((prevConfig: antd3.ModalFuncProps) => antd3.ModalFuncProps)) => void;
+    update: (configUpdate: antd0.ModalFuncProps | ((prevConfig: antd0.ModalFuncProps) => antd0.ModalFuncProps)) => void;
   };
   info: (props: PisellModalFuncProps) => {
     destroy: () => void;
-    update: (configUpdate: antd3.ModalFuncProps | ((prevConfig: antd3.ModalFuncProps) => antd3.ModalFuncProps)) => void;
+    update: (configUpdate: antd0.ModalFuncProps | ((prevConfig: antd0.ModalFuncProps) => antd0.ModalFuncProps)) => void;
   };
   error: (props: PisellModalFuncProps) => {
     destroy: () => void;
-    update: (configUpdate: antd3.ModalFuncProps | ((prevConfig: antd3.ModalFuncProps) => antd3.ModalFuncProps)) => void;
+    update: (configUpdate: antd0.ModalFuncProps | ((prevConfig: antd0.ModalFuncProps) => antd0.ModalFuncProps)) => void;
   };
   warn: (props: PisellModalFuncProps) => any;
   warning: (props: PisellModalFuncProps) => {
     destroy: () => void;
-    update: (configUpdate: antd3.ModalFuncProps | ((prevConfig: antd3.ModalFuncProps) => antd3.ModalFuncProps)) => void;
+    update: (configUpdate: antd0.ModalFuncProps | ((prevConfig: antd0.ModalFuncProps) => antd0.ModalFuncProps)) => void;
   };
   success: (props: PisellModalFuncProps) => {
     destroy: () => void;
-    update: (configUpdate: antd3.ModalFuncProps | ((prevConfig: antd3.ModalFuncProps) => antd3.ModalFuncProps)) => void;
+    update: (configUpdate: antd0.ModalFuncProps | ((prevConfig: antd0.ModalFuncProps) => antd0.ModalFuncProps)) => void;
   };
   Information: (props: InformationProps) => React.JSX.Element;
 };

package/es/components/pisellQuickFilter/index.d.ts

@@ -1,9 +1,9 @@
 import { FilterItemProps } from "../filter/types.js";
-import * as antd2 from "antd";
+import * as antd17 from "antd";
 import React from "react";
 
 //#region src/components/pisellQuickFilter/index.d.ts
-declare const pisellQuickFilter: React.ForwardRefExoticComponent<antd2.FormInstance<any> & {
+declare const pisellQuickFilter: React.ForwardRefExoticComponent<antd17.FormInstance<any> & {
   hasForm?: boolean | undefined;
   children?: React.ReactNode;
   formFiltersPrefix: string;

package/es/components/pisellRecordBoard/PisellRecordBoard.js

@@ -47,7 +47,9 @@ function getDefaultRecordBoardContext(layoutType, selection, rowKey) {
 		selectedRows: selection.selectedRows,
 		onSelectionChange: selection.onSelectionChange,
 		rowKey,
-		childComponentProps: void 0
+		childComponentProps: void 0,
+		scrollAreaHeight: null,
+		setScrollAreaHeight: void 0
 	};
 }
 /**
@@ -57,6 +59,8 @@ function getDefaultRecordBoardContext(layoutType, selection, rowKey) {
 const PisellRecordBoard = (props) => {
 	const { children, layoutType = "grid", rowKey: rowKeyProp, data: dataProp, loading: loadingProp, total: totalProp, pagination: paginationProp, onPageChange: onPageChangeProp, searchParams: searchParamsProp, onSearch: onSearchProp, onReset: onResetProp } = props;
 	_objectWithoutProperties(props, _excluded);
+	/** 默认占满父容器高度（父容器需有高度，如 height:100vh 或 height:100%） */
+	const fillHeight = true;
 	const mergedChildComponentProps = useMemo(() => mergeChildComponentProps(props), [
 		props.grid,
 		props.toolBar,
@@ -67,6 +71,7 @@ const PisellRecordBoard = (props) => {
 	]);
 	const [internalSelectedKeys, setInternalSelectedKeys] = useState([]);
 	const [internalSelectedRows, setInternalSelectedRows] = useState([]);
+	const [scrollAreaHeight, setScrollAreaHeight] = useState(null);
 	const [internalColumnVisibility, setInternalColumnVisibility] = useState(() => {
 		var _props$grid$defaultHi, _props$grid, _props$grid$columns, _props$grid2;
 		const fromConfig = (_props$grid$defaultHi = (_props$grid = props.grid) === null || _props$grid === void 0 ? void 0 : _props$grid.defaultHiddenColumnKeys) !== null && _props$grid$defaultHi !== void 0 ? _props$grid$defaultHi : [];
@@ -123,7 +128,10 @@ const PisellRecordBoard = (props) => {
 			onSelectionChange,
 			columnVisibility: internalColumnVisibility,
 			onColumnVisibilityChange: onColumnVisibilityChangeInternal,
-			childComponentProps: mergedChildComponentProps !== null && mergedChildComponentProps !== void 0 ? mergedChildComponentProps : defaultCtx.childComponentProps
+			childComponentProps: mergedChildComponentProps !== null && mergedChildComponentProps !== void 0 ? mergedChildComponentProps : defaultCtx.childComponentProps,
+			fillHeight,
+			scrollAreaHeight,
+			setScrollAreaHeight
 		});
 	}, [
 		layoutType,
@@ -141,9 +149,20 @@ const PisellRecordBoard = (props) => {
 		internalSelectedRows,
 		onSelectionChangeInternal,
 		internalColumnVisibility,
-		onColumnVisibilityChangeInternal
+		onColumnVisibilityChangeInternal,
+		fillHeight,
+		scrollAreaHeight
 	]);
-	return /* @__PURE__ */ React.createElement(RecordBoardProvider, { value: contextValue }, children);
+	const content = /* @__PURE__ */ React.createElement(RecordBoardProvider, { value: contextValue }, children);
+	return /* @__PURE__ */ React.createElement("div", {
+		className: "pisell-record-board-root",
+		style: {
+			height: "100%",
+			display: "flex",
+			flexDirection: "column",
+			minHeight: 0
+		}
+	}, content);
 };
 var PisellRecordBoard_default = PisellRecordBoard;
 

package/es/components/pisellRecordBoard/docs/PisellRecordBoard.md

@@ -503,6 +503,8 @@ export default function TableOnRowClickExample() {
 | data / loading / total / pagination / onPageChange / searchParams / onSearch / onReset | 各自类型 | 打散的数据与回调 |
 | grid / toolBar / search / paginationConfig / batchActionBar / cardList | 各自类型 | 打散的子组件配置。**grid** 类型为 RecordBoardGridProps（基于 TableProps 省略 dataSource/loading/pagination/columns/scroll/size/rowSelection），多选在 grid 内；支持 Table 透传：onRow、onHeaderRow、expandable、rowClassName、summary 等 |
 
+默认占满父容器高度（父容器需有高度，如 `height: 100vh` 或 `height: 100%`），内容区可滚动，分页器贴底。
+
 ### 子组件
 
 | 子组件                                     | 说明                                                                                                                          |

package/es/components/pisellRecordBoard/layouts/GridLayout/Grid.js

@@ -12,7 +12,7 @@ const _excluded = [
 	"columns",
 	"rowKey",
 	"rowSelection"
-];
+], _excluded2 = ["autoCalc"];
 function getRowKey(record, rowKey) {
 	var _ref, _record$id;
 	if (typeof rowKey === "function") return rowKey(record);
@@ -22,7 +22,7 @@ function getRowKey(record, rowKey) {
 /**
 * Grid 布局下的数据视图：使用 antd Table，从 context 取 data / loading / 多选态。
 */
-/** Context 中与 Table 无关的 key，透传 Table 时排除，避免覆盖或无效传递 */
+/** Context 中与 Table 无关的 key，透传 Table 时排除，避免覆盖或无效传递（含 grid 合并进的 columns/scroll 等） */
 const CONTEXT_ONLY_KEYS = [
 	"data",
 	"loading",
@@ -43,10 +43,12 @@ const CONTEXT_ONLY_KEYS = [
 	"columns",
 	"scroll",
 	"size",
-	"defaultHiddenColumnKeys"
+	"defaultHiddenColumnKeys",
+	"scrollAreaHeight",
+	"setScrollAreaHeight"
 ];
 const RecordBoardGridView = (props) => {
-	var _ref2, _rest$scroll, _ctx$data;
+	var _ref2, _ctx$data;
 	const ctx = useRecordBoardContext({ displayName: "grid" });
 	const { render, columns: columnsProp, rowKey: rowKeyProp, rowSelection: rowSelectionProp } = props, rest = _objectWithoutProperties(props, _excluded);
 	const rawColumns = (_ref2 = columnsProp !== null && columnsProp !== void 0 ? columnsProp : ctx.columns) !== null && _ref2 !== void 0 ? _ref2 : [];
@@ -85,7 +87,34 @@ const RecordBoardGridView = (props) => {
 		return picked;
 	}, [ctx]);
 	if (typeof render === "function") return /* @__PURE__ */ React.createElement(React.Fragment, null, render(_objectSpread2(_objectSpread2({}, ctx), rest)));
-	const tableScroll = (_rest$scroll = rest.scroll) !== null && _rest$scroll !== void 0 ? _rest$scroll : ctx.scroll;
+	const tableScroll = useMemo(() => {
+		var _rest$scroll;
+		const scroll = (_rest$scroll = rest.scroll) !== null && _rest$scroll !== void 0 ? _rest$scroll : ctx.scroll;
+		if ((scroll === null || scroll === void 0 ? void 0 : scroll.autoCalc) && typeof ctx.scrollAreaHeight === "number") {
+			var _scroll$x;
+			const wrapHeight = ctx.scrollAreaHeight;
+			ctx.pagination;
+			return {
+				x: (_scroll$x = scroll.x) !== null && _scroll$x !== void 0 ? _scroll$x : columns.reduce((p, c) => {
+					var _c$width;
+					return p + ((_c$width = c.width) !== null && _c$width !== void 0 ? _c$width : 250);
+				}, 0) || 2e3,
+				y: Math.max(wrapHeight - 40, 100),
+				scrollToFirstRowOnChange: scroll.scrollToFirstRowOnChange
+			};
+		}
+		if (scroll && typeof scroll === "object") {
+			const _ref4 = scroll, { autoCalc: _a } = _ref4, restScroll = _objectWithoutProperties(_ref4, _excluded2);
+			return Object.keys(restScroll).length ? restScroll : void 0;
+		}
+		return scroll;
+	}, [
+		rest.scroll,
+		ctx.scroll,
+		ctx.scrollAreaHeight,
+		ctx.pagination,
+		columns
+	]);
 	return /* @__PURE__ */ React.createElement("div", {
 		"data-layout-slot": "grid",
 		className: "pisell-lowcode-record-board-grid"

package/es/components/pisellRecordBoard/layouts/GridLayout/Grid.less

@@ -7,6 +7,41 @@
   }
 }
 
+// 纯 CSS 占满高度：滚动发生在 .pisell-record-board-scroll-body，表头 sticky 固定；高度传到 table
+.pisell-record-board-scroll-body .pisell-lowcode-record-board-grid {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+
+  .pisell-lowcode-table-thead .pisell-lowcode-table-cell {
+    position: sticky;
+    top: 0;
+    z-index: 1;
+    background: var(--ant-color-bg-container, #ffffff);
+  }
+
+  // 让 antd Table 外层占满，使 scroll.y 生效且高度链不断
+  .pisell-lowcode-table-wrapper {
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+  }
+  .pisell-lowcode-table-wrapper .pisell-lowcode-table {
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+  }
+  .pisell-lowcode-table-wrapper .pisell-lowcode-table .pisell-lowcode-table-container {
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
 // 行状态样式示例（如 grid.rowClassName 返回 'pisell-record-board-row-cancelled'）
 .pisell-record-board-row-cancelled {
   background: #fff1f0;

package/es/components/pisellRecordBoard/shellFrame/ToolBar/ToolBarFilter.less

@@ -4,7 +4,7 @@
   flex-wrap: nowrap;
   align-items: center;
   width: 100%;
-  //gap: 16px;
+  gap: 16px;
 
   .record-board-toolbar-find-wrap {
     flex: 1;

package/es/components/pisellRecordBoard/shellFrame/index.d.ts

@@ -10,6 +10,7 @@ import React from "react";
 /**
  * Shell Frame：基于 PisellShellFrame 的 RecordBoard 壳层。
  * 提供工具栏、多选操作条、分页；与 Layout 同级，包裹在 Layout 外层。
+ * 默认占满父容器高度，内容区可滚动，分页器固定在底部。
  *
  * 使用方式：
  * <PisellRecordBoard>

package/es/components/pisellRecordBoard/shellFrame/index.js

@@ -1,3 +1,5 @@
+import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.108.0/helpers/objectSpread2.js";
+import { useRecordBoardContext } from "../hooks/useRecordBoardContext.js";
 import { PisellShellFrame } from "../../pisellShellFrame/PisellShellFrame.js";
 import ToolBarReset_default from "./ToolBarReset/index.js";
 import ToolBarQuickFilter_default from "./ToolBarQuickFilter/index.js";
@@ -5,12 +7,48 @@ import ToolBar_default from "./ToolBar/index.js";
 import BatchActionBar_default from "./BatchActionBar/index.js";
 import Pagination_default from "./Pagination/index.js";
 import Search_default from "./Search/index.js";
-import React from "react";
+import React, { useEffect, useRef } from "react";
 
 //#region src/components/pisellRecordBoard/shellFrame/index.tsx
+/** fillHeight 时内容区可滚动、分页器贴底；默认表头 sticky；grid.scroll.autoCalc 时需测量高度供 scroll.y */
+const FILL_HEIGHT_SCROLL_STYLE = {
+	flex: 1,
+	minHeight: 0,
+	overflow: "auto"
+};
+/** 测量滚动区高度并写入 context，供 Grid 在 scroll.autoCalc 时计算 scroll.y（对齐 table useGenScroll）。autoCalc 时 overflow 为 hidden，仅 Table 内部滚动。 */
+function ScrollAreaMeasurer({ children, onHeight, autoCalc }) {
+	const ref = useRef(null);
+	useEffect(() => {
+		const el = ref.current;
+		if (!el) return;
+		const ro = new ResizeObserver((entries) => {
+			const entry = entries[0];
+			if (entry) onHeight(entry.contentRect.height);
+		});
+		ro.observe(el);
+		onHeight(el.getBoundingClientRect().height);
+		return () => {
+			ro.disconnect();
+			onHeight(null);
+		};
+	}, [onHeight]);
+	return /* @__PURE__ */ React.createElement("div", {
+		ref,
+		className: "pisell-record-board-scroll-body",
+		style: _objectSpread2(_objectSpread2({}, FILL_HEIGHT_SCROLL_STYLE), {}, { overflow: autoCalc ? "hidden" : "auto" })
+	}, children);
+}
+const FILL_HEIGHT_WRAPPER_STYLE = {
+	flex: 1,
+	minHeight: 0,
+	display: "flex",
+	flexDirection: "column"
+};
 /**
 * Shell Frame：基于 PisellShellFrame 的 RecordBoard 壳层。
 * 提供工具栏、多选操作条、分页；与 Layout 同级，包裹在 Layout 外层。
+* 默认占满父容器高度，内容区可滚动，分页器固定在底部。
 *
 * 使用方式：
 * <PisellRecordBoard>
@@ -20,16 +58,26 @@ import React from "react";
 * </PisellRecordBoard>
 */
 const RecordBoardShellFrame = ({ children, className, style }) => {
-	return /* @__PURE__ */ React.createElement(PisellShellFrame, {
+	var _ctx$setScrollAreaHei, _ctx$grid;
+	const ctx = useRecordBoardContext({ displayName: "RecordBoard.ShellFrame" });
+	const fillHeight = (ctx === null || ctx === void 0 ? void 0 : ctx.fillHeight) === true;
+	const bodyContent = fillHeight ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(ScrollAreaMeasurer, {
+		onHeight: (_ctx$setScrollAreaHei = ctx === null || ctx === void 0 ? void 0 : ctx.setScrollAreaHeight) !== null && _ctx$setScrollAreaHei !== void 0 ? _ctx$setScrollAreaHei : (() => {}),
+		autoCalc: ctx === null || ctx === void 0 || (_ctx$grid = ctx.grid) === null || _ctx$grid === void 0 || (_ctx$grid = _ctx$grid.scroll) === null || _ctx$grid === void 0 ? void 0 : _ctx$grid.autoCalc
+	}, children), /* @__PURE__ */ React.createElement(Pagination_default, null)) : /* @__PURE__ */ React.createElement(React.Fragment, null, children, /* @__PURE__ */ React.createElement(Pagination_default, null));
+	const shellStyle = fillHeight && style ? _objectSpread2(_objectSpread2({}, style), FILL_HEIGHT_WRAPPER_STYLE) : fillHeight ? FILL_HEIGHT_WRAPPER_STYLE : style;
+	const wrapper = /* @__PURE__ */ React.createElement(PisellShellFrame, {
 		className,
-		style,
+		style: shellStyle,
 		config: {
 			showToolbar: true,
 			showBatchActionBar: true
 		},
 		toolbar: /* @__PURE__ */ React.createElement(ToolBar_default, null),
 		batchActionBar: /* @__PURE__ */ React.createElement(BatchActionBar_default, null)
-	}, children, /* @__PURE__ */ React.createElement(Pagination_default, null));
+	}, bodyContent);
+	if (fillHeight) return /* @__PURE__ */ React.createElement("div", { style: FILL_HEIGHT_WRAPPER_STYLE }, wrapper);
+	return wrapper;
 };
 RecordBoardShellFrame.displayName = "RecordBoard.ShellFrame";
 var shellFrame_default = RecordBoardShellFrame;

package/es/components/pisellRecordBoard/types.d.ts

@@ -29,7 +29,7 @@ type RecordBoardOptionItem = {
 type RecordBoardGetOptions = (() => RecordBoardOptionItem[]) | (() => Promise<RecordBoardOptionItem[]>);
 /** 列筛选配置：不传列 type 时使用。可配置 type + options/props，或传入 component（接收 value/onChange）。 */
 interface RecordBoardColumnFilterConfig {
-  type?: 'single' | 'input' | 'datePicker' | 'rangePicker' | 'search';
+  type?: 'single' | 'input' | 'datePicker' | 'rangePicker' | 'rangePickerNew' | 'search';
   label?: string;
   options?: RecordBoardOptionItem[];
   /** 同步或异步获取选项，与 options 二选一；支持 singleSelect/multipleSelect 及无 type 时 type:'single' */
@@ -142,6 +142,12 @@ interface RecordBoardContextValue {
   onColumnVisibilityChange?: (visibility: Record<string, boolean>) => void;
   /** 各子组件透传 props，由 Provider 注入 */
   childComponentProps?: RecordBoardChildComponentProps;
+  /** 是否占满父容器高度，供 ShellFrame 做弹性布局（内容区纯 CSS 滚动 + 表头 sticky；scroll.autoCalc 时用测量高度） */
+  fillHeight?: boolean;
+  /** 内容区滚动容器高度（fillHeight 且 grid.scroll.autoCalc 时由 ShellFrame 测量），供 Grid 计算 scroll.y */
+  scrollAreaHeight?: number | null;
+  /** 设置内容区滚动容器高度（由 ShellFrame 测量组件调用） */
+  setScrollAreaHeight?: (height: number | null) => void;
 }
 /**
  * 各 layout 下子组件的可选透传配置（类似 ChildComponentProps）
@@ -191,10 +197,18 @@ type RecordBoardSearchProps = Record<string, any>;
  */
 type RecordBoardGridProps = {
   /** 列配置；ToolBar 据此派生筛选与排序，ColumnSetting 据此做列显示隐藏 */columns?: RecordBoardColumnType[]; /** 默认隐藏的列 key 列表（对应 columns 的 key 或 dataIndex），用于初始化列显隐状态 */
-  defaultHiddenColumnKeys?: string[]; /** 表格滚动配置，同 antd Table scroll */
+  defaultHiddenColumnKeys?: string[];
+  /**
+   * 表格滚动配置，对齐 materials Table useGenScroll。
+   * - x / y：同 antd Table scroll。
+   * - autoCalc：为 true 时根据内容区高度自动计算 scroll.y（需 fillHeight），表头固定、表体滚动。
+   * - scrollToFirstRowOnChange：翻页后是否滚动到第一行。
+   */
   scroll?: {
     x?: number | string;
     y?: number | string;
+    autoCalc?: boolean;
+    scrollToFirstRowOnChange?: boolean;
   }; /** 表格尺寸 */
   size?: 'small' | 'middle' | 'default'; /** 当前选中的行 key 列表（多选） */
   selectedKeys?: Key[]; /** 当前选中的行数据（多选） */