@pisell/materials 1.8.41 → 1.8.42

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

@@ -5,6 +5,7 @@ import { useRecordBoardContext } from "../hooks/useRecordBoardContext.js";
 import PisellShellFrame from "../../pisellShellFrame/PisellShellFrame.js";
 import "./FloorMap.js";
 import "./Calendar/RecordBoardCalendar.js";
+import "./ResourceWall/RecordBoardResourceWall.js";
 import { partitionShellFrameChildren } from "../utils/partitionShellFrameChildren.js";
 import "./ToolBarReset/index.js";
 import "./ToolBarQuickFilter/index.js";
@@ -14,10 +15,21 @@ import RecordBoardBatchActionBar from "./BatchActionBar/index.js";
 import RecordBoardPagination from "./Pagination/index.js";
 import "./Search/index.js";
 import { PisellRecordBoardCalendarView } from "./Calendar/PisellRecordBoardCalendarView.js";
+import { PisellRecordBoardResourceWallView } from "./ResourceWall/PisellRecordBoardResourceWallView.js";
 import React, { useEffect, useLayoutEffect, useMemo, useRef } from "react";
 import classNames from "classnames";
 import "./shellFrameFloorMap.less";
 //#region src/components/pisellRecordBoard/shellFrame/index.tsx
+/**
+* 槽位 props 与根级合并：**子组件显式传入**的键覆盖根级；子级为 `undefined` 的键不覆盖（避免吞掉根级回调）。
+* 子槽无 props（`{}`）时直接沿用根级对象引用。
+*/
+function mergeRecordBoardSlotProps(root, child) {
+	if (!child || Object.keys(child).length === 0) return root;
+	const base = _objectSpread2({}, root !== null && root !== void 0 ? root : {});
+	for (const [key, val] of Object.entries(child)) if (val !== void 0) base[key] = val;
+	return base;
+}
 /** fillHeight 时内容区可滚动、分页器贴底；默认表头 sticky；grid.scroll.autoCalc 时需测量高度供 scroll.y */
 const FILL_HEIGHT_SCROLL_STYLE = {
 	flex: 1,
@@ -55,20 +67,17 @@ const FILL_HEIGHT_WRAPPER_STYLE = {
 };
 /**
 * Shell Frame：基于 PisellShellFrame 的 RecordBoard 壳层。
-* 解析子节点：**GridLayout / CardLayout 等** 与可选 **\<PisellRecordBoard.FloorMap /\>**、**\<PisellRecordBoard.Calendar /\>**；
-* 子视图组合与 Segmented 切换由子节点与根级 props 决定；根级 `floorMap` / `calendar` 与子槽合并时**子组件优先**。
+* 解析子节点：**GridLayout / CardLayout 等** 与可选 **FloorMap / Calendar / ResourceWall** 槽；
+* 子视图组合与 Segmented 切换由子节点与根级 props 决定；根级 `floorMap` / `calendar` / `resourceWall` 与子槽合并时**子组件优先**。
 */
-const RecordBoardShellFrame = ({ children, className, style }) => {
+const RecordBoardShellFrame = ({ children, className, style, belowToolbar }) => {
 	var _ctx$floorMapLayoutRe, _effectiveFloorMapPro, _effectiveFloorMapPro2, _effectiveFloorMapPro3, _ctx$setScrollAreaHei, _ctx$childComponentPr;
 	const ctx = useRecordBoardContext();
 	const fillHeight = (ctx === null || ctx === void 0 ? void 0 : ctx.fillHeight) === true;
-	const { gridChildren, floorMapPropsFromChild, calendarPropsFromChild, hasGridContent, hasFloorMapChild, hasCalendarChild } = useMemo(() => partitionShellFrameChildren(children), [children]);
+	const { gridChildren, floorMapPropsFromChild, calendarPropsFromChild, resourceWallPropsFromChild, hasGridContent, hasFloorMapChild, hasCalendarChild, hasResourceWallChild } = useMemo(() => partitionShellFrameChildren(children), [children]);
 	/** 子组件 FloorMap 与根级 context.floorMapProps 合并，子 props 覆盖根级 */
 	const effectiveFloorMapProps = useMemo(() => {
-		if (hasFloorMapChild) {
-			var _ctx$floorMapProps;
-			return _objectSpread2(_objectSpread2({}, (_ctx$floorMapProps = ctx.floorMapProps) !== null && _ctx$floorMapProps !== void 0 ? _ctx$floorMapProps : {}), floorMapPropsFromChild !== null && floorMapPropsFromChild !== void 0 ? floorMapPropsFromChild : {});
-		}
+		if (hasFloorMapChild) return mergeRecordBoardSlotProps(ctx.floorMapProps, floorMapPropsFromChild);
 		return ctx.floorMapProps;
 	}, [
 		hasFloorMapChild,
@@ -77,16 +86,21 @@ const RecordBoardShellFrame = ({ children, className, style }) => {
 	]);
 	/** 子组件 Calendar 与根级 context.calendarProps 合并，子 props 覆盖根级 */
 	const effectiveCalendarProps = useMemo(() => {
-		if (hasCalendarChild) {
-			var _ctx$calendarProps;
-			return _objectSpread2(_objectSpread2({}, (_ctx$calendarProps = ctx.calendarProps) !== null && _ctx$calendarProps !== void 0 ? _ctx$calendarProps : {}), calendarPropsFromChild !== null && calendarPropsFromChild !== void 0 ? calendarPropsFromChild : {});
-		}
+		if (hasCalendarChild) return mergeRecordBoardSlotProps(ctx.calendarProps, calendarPropsFromChild);
 		return ctx.calendarProps;
 	}, [
 		hasCalendarChild,
 		calendarPropsFromChild,
 		ctx.calendarProps
 	]);
+	const effectiveResourceWallProps = useMemo(() => {
+		if (hasResourceWallChild) return mergeRecordBoardSlotProps(ctx.resourceWallProps, resourceWallPropsFromChild);
+		return ctx.resourceWallProps;
+	}, [
+		hasResourceWallChild,
+		resourceWallPropsFromChild,
+		ctx.resourceWallProps
+	]);
 	/**
 	* 平面图使用整份多 key：根级 Context.dataSources 与 FloorMap props 合并（后者覆盖同 key）。
 	* 表格分页切片只影响 ctx.data，不得缩短此对象。
@@ -99,42 +113,65 @@ const RecordBoardShellFrame = ({ children, className, style }) => {
 	}, [ctx.dataSources, effectiveFloorMapProps === null || effectiveFloorMapProps === void 0 ? void 0 : effectiveFloorMapProps.dataSources]);
 	const hasFloorMapSlot = hasFloorMapChild || ctx.floorMapProps != null;
 	const hasCalendarSlot = hasCalendarChild || ctx.calendarProps != null;
+	const hasResourceWallSlot = hasResourceWallChild || ctx.resourceWallProps != null;
 	const shellBodyMeta = useMemo(() => ({
 		effectiveFloorMapProps,
 		effectiveCalendarProps,
+		effectiveResourceWallProps,
 		hasGridContent,
 		hasFloorMapSlot,
-		hasCalendarSlot
+		hasCalendarSlot,
+		hasResourceWallSlot
 	}), [
 		effectiveFloorMapProps,
 		effectiveCalendarProps,
+		effectiveResourceWallProps,
 		hasGridContent,
 		hasFloorMapSlot,
-		hasCalendarSlot
+		hasCalendarSlot,
+		hasResourceWallSlot
 	]);
 	const showGrid = useMemo(() => hasGridContent && ctx.bodyView === "grid", [hasGridContent, ctx.bodyView]);
+	/** 无限滚动时不展示底部分页（含 paginationRender 挂载点） */
+	const showGridPagination = showGrid && ctx.gridInfiniteScroll !== true;
 	const showFloorMap = useMemo(() => hasFloorMapSlot && effectiveFloorMapProps != null && ctx.bodyView === "floorMap", [
 		hasFloorMapSlot,
 		effectiveFloorMapProps,
 		ctx.bodyView
 	]);
 	const showCalendar = useMemo(() => hasCalendarSlot && ctx.bodyView === "calendar", [hasCalendarSlot, ctx.bodyView]);
+	const showResourceWall = useMemo(() => hasResourceWallSlot && ctx.bodyView === "resourceWall", [hasResourceWallSlot, ctx.bodyView]);
 	/** 仅单一主区时同步 bodyView，避免切换组合后状态不一致 */
 	useLayoutEffect(() => {
 		if (!ctx.setBodyView) return;
-		if (hasFloorMapSlot && !hasGridContent && !hasCalendarSlot) {
+		const hasG = hasGridContent;
+		const hasF = hasFloorMapSlot;
+		const hasC = hasCalendarSlot;
+		const hasR = hasResourceWallSlot;
+		if ([
+			hasG,
+			hasF,
+			hasC,
+			hasR
+		].filter(Boolean).length !== 1) return;
+		if (hasF && !hasG && !hasC && !hasR) {
 			ctx.setBodyView("floorMap");
 			return;
 		}
-		if (hasCalendarSlot && !hasGridContent && !hasFloorMapSlot) {
+		if (hasC && !hasG && !hasF && !hasR) {
 			ctx.setBodyView("calendar");
 			return;
 		}
-		if (hasGridContent && !hasFloorMapSlot && !hasCalendarSlot) ctx.setBodyView("grid");
+		if (hasR && !hasG && !hasF && !hasC) {
+			ctx.setBodyView("resourceWall");
+			return;
+		}
+		if (hasG && !hasF && !hasC && !hasR) ctx.setBodyView("grid");
 	}, [
 		hasFloorMapSlot,
 		hasGridContent,
 		hasCalendarSlot,
+		hasResourceWallSlot,
 		ctx.setBodyView
 	]);
 	const floorMapLayoutProviderValue = useMemo(() => {
@@ -170,19 +207,36 @@ const RecordBoardShellFrame = ({ children, className, style }) => {
 			position: "relative"
 		}
 	}, /* @__PURE__ */ React.createElement(PisellRecordBoardCalendarView, effectiveCalendarProps)) : null;
+	const resourceWallNode = showResourceWall && effectiveResourceWallProps ? /* @__PURE__ */ React.createElement("div", {
+		className: "pisell-record-board-resource-wall-viewport",
+		style: {
+			flex: 1,
+			minHeight: 0,
+			display: "flex",
+			flexDirection: "column",
+			overflow: "hidden",
+			position: "relative"
+		}
+	}, /* @__PURE__ */ React.createElement(PisellRecordBoardResourceWallView, effectiveResourceWallProps)) : null;
 	const bodyContent = fillHeight ? /* @__PURE__ */ React.createElement(React.Fragment, null, showGrid ? /* @__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$childComponentPr = ctx.childComponentProps) === null || _ctx$childComponentPr === void 0 || (_ctx$childComponentPr = _ctx$childComponentPr.grid) === null || _ctx$childComponentPr === void 0 || (_ctx$childComponentPr = _ctx$childComponentPr.scroll) === null || _ctx$childComponentPr === void 0 ? void 0 : _ctx$childComponentPr.autoCalc
-	}, gridChildren) : showCalendar ? calendarNode : floorMapNode, showGrid ? /* @__PURE__ */ React.createElement(RecordBoardPagination, null) : null) : /* @__PURE__ */ React.createElement(React.Fragment, null, showGrid ? gridChildren : showCalendar ? calendarNode : floorMapNode, showGrid ? /* @__PURE__ */ React.createElement(RecordBoardPagination, null) : null);
+	}, gridChildren) : showResourceWall ? resourceWallNode : showCalendar ? calendarNode : floorMapNode, showGridPagination ? /* @__PURE__ */ React.createElement(RecordBoardPagination, null) : null) : /* @__PURE__ */ React.createElement(React.Fragment, null, showGrid ? gridChildren : showResourceWall ? resourceWallNode : showCalendar ? calendarNode : floorMapNode, showGridPagination ? /* @__PURE__ */ React.createElement(RecordBoardPagination, null) : null);
 	const shellStyle = fillHeight && style ? _objectSpread2(_objectSpread2({}, style), FILL_HEIGHT_WRAPPER_STYLE) : fillHeight ? FILL_HEIGHT_WRAPPER_STYLE : style;
 	const wrapper = /* @__PURE__ */ React.createElement(RecordBoardShellBodyMetaContext.Provider, { value: shellBodyMeta }, /* @__PURE__ */ React.createElement(PisellShellFrame, {
-		className: classNames(className, { "pisell-shell-frame--floor-map-view": !showGrid }),
+		className: classNames(className, {
+			"pisell-shell-frame--body-subview": !showGrid,
+			"pisell-shell-frame--floor-map-view": showFloorMap,
+			"pisell-shell-frame--calendar-view": showCalendar,
+			"pisell-shell-frame--resource-wall-view": showResourceWall
+		}),
 		style: shellStyle,
 		config: {
 			showToolbar: true,
 			showBatchActionBar: true
 		},
 		toolbar: /* @__PURE__ */ React.createElement(RecordBoardToolBar, null),
+		belowToolbar,
 		batchActionBar: /* @__PURE__ */ React.createElement(RecordBoardBatchActionBar, null)
 	}, bodyContent));
 	if (fillHeight) return /* @__PURE__ */ React.createElement("div", { style: FILL_HEIGHT_WRAPPER_STYLE }, wrapper);