@pisell/materials 1.8.31 → 1.8.33

package/es/components/pisellFloorMapLayout/hooks/useFloorMapTransformMetrics.js

@@ -17,6 +17,12 @@ import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } fr
 import { getContentSize, getPixelBoundingBox } from "../utils/layoutMeasurements";
 import { DEFAULT_BOUNDING_PADDING, FIT_BOUNDS_MATCH_POS_EPSILON, FIT_BOUNDS_MATCH_SCALE_EPSILON, VIEWPORT_PERSIST_DEBOUNCE_MS, VIEWPORT_TOP_LEFT_MARGIN, readPersistedViewport, readPersistedViewportLock, writePersistedViewport, writePersistedViewportLock } from "./floorMapViewportPersistence";
 
+/**
+ * react-zoom-pan-pinch：`setTransform` 未显式传 `animationTime` 时默认约 200ms 缓动；
+ * 兜底清除「全览激活保持」略大于该值，避免极少数帧未到容差时限位不解除。
+ */
+var FIT_BOUNDS_PROGRAMMATIC_TWEEN_GUARD_MS = 400;
+
 /** react-zoom-pan-pinch TransformWrapper render 注入的上下文 */
 
 export function useFloorMapTransformMetrics(params) {
@@ -116,6 +122,20 @@ export function useFloorMapTransformMetrics(params) {
     isAtFitBounds = _useState10[0],
     setIsAtFitBounds = _useState10[1];
 
+  /**
+   * 程序化 fitBounds 使用库默认缓动时，`onTransformed` 中间帧与快照不等会关掉「全览」激活态。
+   * 缓动持有期内不按中间帧降级，仅在到达快照（容差内）或兜底超时后再按真实 transform 对齐。
+   */
+  var fitBoundsTweenHoldRef = useRef(false);
+  var fitBoundsTweenHoldClearTimerRef = useRef(null);
+  var clearFitBoundsTweenHold = useCallback(function () {
+    if (fitBoundsTweenHoldClearTimerRef.current != null) {
+      clearTimeout(fitBoundsTweenHoldClearTimerRef.current);
+      fitBoundsTweenHoldClearTimerRef.current = null;
+    }
+    fitBoundsTweenHoldRef.current = false;
+  }, []);
+
   /**
    * 视口锁定态：按 viewportPersistKey 维度持久化到 localStorage。
    * - 切 / 挂载时按 key 读初始值；
@@ -302,7 +322,37 @@ export function useFloorMapTransformMetrics(params) {
     var wrapper = container.querySelector('.react-transform-wrapper');
     if (!wrapper) return false;
     var wrapperRect = wrapper.getBoundingClientRect();
-    if (wrapperRect.width <= 0 || wrapperRect.height <= 0) return false;
+    var wEl = wrapper;
+    /**
+     * 祖先链上若有 transform: scale / zoom，getBoundingClientRect 为「视觉」尺寸，
+     * clientWidth/Height 为布局盒尺寸。react-zoom-pan-pinch 的平移/缩放工作在布局坐标系，
+     * 若全览仅用 rect 算 avail 与 position，会与库内部不一致（日志：visual/layout≈0.864）。
+     */
+    var layoutW = wEl.clientWidth > 0 ? wEl.clientWidth : wrapperRect.width;
+    var layoutH = wEl.clientHeight > 0 ? wEl.clientHeight : wrapperRect.height;
+    if (layoutW <= 0 || layoutH <= 0) return false;
+
+    /** 程序化 setTransform 默认带缓动：写入快照后立即保持「全览激活」，缓动结束前不因中间帧关掉 */
+    var applyProgrammaticFit = function applyProgrammaticFit(fx, fy, fScale) {
+      clearFitBoundsTweenHold();
+      lastFitSnapshotRef.current = {
+        x: fx,
+        y: fy,
+        scale: fScale
+      };
+      setIsAtFitBounds(true);
+      fitBoundsTweenHoldRef.current = true;
+      fitBoundsTweenHoldClearTimerRef.current = setTimeout(function () {
+        fitBoundsTweenHoldClearTimerRef.current = null;
+        fitBoundsTweenHoldRef.current = false;
+        var cur = lastTransformRef.current;
+        var s = lastFitSnapshotRef.current;
+        if (!s) return;
+        var same = Math.abs(s.x - cur.x) < FIT_BOUNDS_MATCH_POS_EPSILON && Math.abs(s.y - cur.y) < FIT_BOUNDS_MATCH_POS_EPSILON && Math.abs(s.scale - cur.scale) < FIT_BOUNDS_MATCH_SCALE_EPSILON;
+        setIsAtFitBounds(same);
+      }, FIT_BOUNDS_PROGRAMMATIC_TWEEN_GUARD_MS);
+      ctx.setTransform(fx, fy, fScale);
+    };
 
     /**
      * 平面图像素模式：按「图元轴对齐包围盒」缩放并居中，不按整块 content（含编辑态撑满视口的空白）适配。
@@ -314,40 +364,28 @@ export function useFloorMapTransformMetrics(params) {
       var bw = Math.max(1, pixelBox.maxRight - pixelBox.minLeft);
       var bh = Math.max(1, pixelBox.maxBottom - pixelBox.minTop);
       var edgePx = 0;
-      var availW = Math.max(1, wrapperRect.width - 2 * edgePx);
-      var availH = Math.max(1, wrapperRect.height - 2 * edgePx);
+      var availW = Math.max(1, layoutW - 2 * edgePx);
+      var availH = Math.max(1, layoutH - 2 * edgePx);
       var _raw = Math.min(availW / bw, availH / bh);
       var _nextScale = Math.min(_raw, (_zoom$max2 = zoom.max) !== null && _zoom$max2 !== void 0 ? _zoom$max2 : 2);
       var ap = alignPadSingle !== null && alignPadSingle !== void 0 ? alignPadSingle : padSingle;
       var bboxCx = ap + bw / 2;
       var bboxCy = ap + bh / 2;
-      var _x = wrapperRect.width / 2 - bboxCx * _nextScale;
-      var _y = wrapperRect.height / 2 - bboxCy * _nextScale;
-      ctx.setTransform(_x, _y, _nextScale);
-      lastFitSnapshotRef.current = {
-        x: _x,
-        y: _y,
-        scale: _nextScale
-      };
-      setIsAtFitBounds(true);
+      var _x = layoutW / 2 - bboxCx * _nextScale;
+      var _y = layoutH / 2 - bboxCy * _nextScale;
+      applyProgrammaticFit(_x, _y, _nextScale);
       return true;
     }
     if (contentWidth <= 0 || contentHeight <= 0) return false;
     /** 非平面图或无图元：仍按整块 content 适配 */
-    var raw = Math.min(wrapperRect.width / contentWidth, wrapperRect.height / contentHeight);
+    var raw = Math.min(layoutW / contentWidth, layoutH / contentHeight);
     var nextScale = Math.min(raw, (_zoom$max3 = zoom.max) !== null && _zoom$max3 !== void 0 ? _zoom$max3 : 2);
     var padA = alignPadSingle !== null && alignPadSingle !== void 0 ? alignPadSingle : 0;
     var x = VIEWPORT_TOP_LEFT_MARGIN - padA * nextScale;
     var y = VIEWPORT_TOP_LEFT_MARGIN - padA * nextScale;
-    ctx.setTransform(x, y, nextScale);
-    lastFitSnapshotRef.current = {
-      x: x,
-      y: y,
-      scale: nextScale
-    };
-    setIsAtFitBounds(true);
+    applyProgrammaticFit(x, y, nextScale);
     return true;
-  }, [contentWidth, contentHeight, zoom.max, transformRef, alignPadSingle, isFloorMapView, effectiveItemUnit, items, cellSize, padSingle]);
+  }, [clearFitBoundsTweenHold, contentWidth, contentHeight, zoom, transformRef, alignPadSingle, isFloorMapView, effectiveItemUnit, items, cellSize, padSingle]);
 
   /** 让"进入伪全屏后自动 fit"的 effect 能拿到最新的 fitBounds 实现 */
   fitBoundsRef.current = fitBounds;
@@ -528,6 +566,14 @@ export function useFloorMapTransformMetrics(params) {
     var snap = lastFitSnapshotRef.current;
     if (snap) {
       var same = Math.abs(snap.x - x) < FIT_BOUNDS_MATCH_POS_EPSILON && Math.abs(snap.y - y) < FIT_BOUNDS_MATCH_POS_EPSILON && Math.abs(snap.scale - nextScale) < FIT_BOUNDS_MATCH_SCALE_EPSILON;
+      if (fitBoundsTweenHoldRef.current) {
+        if (same) {
+          clearFitBoundsTweenHold();
+          setIsAtFitBounds(true);
+        }
+        /** 缓动中间帧：保持已设的「全览激活」，不因尚未对齐快照而关掉 */
+        return;
+      }
       setIsAtFitBounds(function (prev) {
         return prev === same ? prev : same;
       });
@@ -536,7 +582,7 @@ export function useFloorMapTransformMetrics(params) {
         return prev ? false : prev;
       });
     }
-  }, []);
+  }, [clearFitBoundsTweenHold]);
 
   /**
    * 用户交互结束时（pan / zoom / pinch / wheel stop）调用：
@@ -572,6 +618,7 @@ export function useFloorMapTransformMetrics(params) {
    *    防止后续 effect 反向覆盖缓存值。
    */
   var applyPersistedViewport = useCallback(function (cached) {
+    clearFitBoundsTweenHold();
     var ctx = transformRef.current;
     if (!ctx) return false;
     ctx.setTransform(cached.x, cached.y, cached.scale, 0);
@@ -585,7 +632,7 @@ export function useFloorMapTransformMetrics(params) {
       cachedRestoredFrameRef.current = String(currentFrame);
     }
     return true;
-  }, [transformRef]);
+  }, [clearFitBoundsTweenHold, transformRef]);
 
   /**
    * 切换 viewportPersistKey 或 frameResetKey 时（含挂载、wrapper 重挂载）：
@@ -683,6 +730,10 @@ export function useFloorMapTransformMetrics(params) {
       }
       (_flushPersistRef$curr = flushPersistRef.current) === null || _flushPersistRef$curr === void 0 || _flushPersistRef$curr.call(flushPersistRef);
       flushPersistRef.current = null;
+      if (fitBoundsTweenHoldClearTimerRef.current != null) {
+        clearTimeout(fitBoundsTweenHoldClearTimerRef.current);
+        fitBoundsTweenHoldClearTimerRef.current = null;
+      }
     };
   }, [viewportPersistKey]);
   return {

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

@@ -528,6 +528,11 @@ export interface PisellFloorMapLayoutProps<T extends FloorMapItemBase = FloorMap
      * 是否开启 hover 高亮或 hover 事件，默认 true
      */
     enableHover?: boolean;
+    /**
+     * 阅读态（`mode === 'read'`）：与 {@link rowKey} 解析出的图元 id 相等时，外层容器加选中描边（如详情弹层打开时锚定画布上的桌位）。
+     * 传 `null` / `undefined` / 空字符串时不展示选中外圈。
+     */
+    readModeSelectedItemId?: string | null;
     /**
      * 资源项点击回调
      */

package/es/components/pisellRecordBoard/PisellRecordBoard.js

@@ -102,7 +102,7 @@ function getDefaultRecordBoardContext(layoutType, selection, rowKey) {
  * 平面图推荐在 ShellFrame 内使用 **PisellRecordBoard.FloorMap** 声明，与根级 `floorMap` 合并（子优先）。
  */
 var PisellRecordBoard = function PisellRecordBoard(props) {
-  var _props$columnVisibili;
+  var _props$columnVisibili, _props$grid4;
   var children = props.children,
     _props$layoutType = props.layoutType,
     layoutType = _props$layoutType === void 0 ? 'grid' : _props$layoutType,
@@ -249,7 +249,7 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
     setInternalColumnOrder(columnKeys);
   }, []);
   var contextValue = useMemo(function () {
-    var _gridSelection$select;
+    var _props$grid3, _gridSelection$select;
     var defaultCtx = getDefaultRecordBoardContext(layoutType, {
       selectedKeys: internalSelectedKeys,
       selectedRows: internalSelectedRows,
@@ -258,11 +258,13 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
 
     /** 分页状态（推导表格切片前需要） */
     var pagination = paginationProp !== undefined ? paginationProp : defaultCtx.pagination;
+    var gridInfiniteScroll = ((_props$grid3 = props.grid) === null || _props$grid3 === void 0 ? void 0 : _props$grid3.infiniteScroll) === true;
 
     /**
      * 表格数据：
      * - 显式传入 `data` 时始终用 `data`（如服务端分页当前页）；
      * - 否则若存在 `dataSources` + `gridDataSourceKey`，从对应数组做客户端分页切片。
+     * - `infiniteScroll` 时对该路径做**累积**切片：slice(0, pageNumber * pageSize)，与触底加载多页一致。
      */
     var data;
     var total;
@@ -276,8 +278,13 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
       var pageNumber = pagination.pageNumber,
         pageSize = pagination.pageSize;
       var safeSize = Math.max(1, pageSize);
-      var start = Math.max(0, (pageNumber - 1) * safeSize);
-      data = raw.slice(start, start + safeSize);
+      if (gridInfiniteScroll) {
+        var end = Math.min(raw.length, pageNumber * safeSize);
+        data = raw.slice(0, end);
+      } else {
+        var start = Math.max(0, (pageNumber - 1) * safeSize);
+        data = raw.slice(start, start + safeSize);
+      }
     } else {
       data = defaultCtx.data;
       total = totalProp !== undefined ? totalProp : defaultCtx.total;
@@ -333,9 +340,10 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
        * 业务方传入的自定义分页渲染：注入 ctx 后，shellFrame 内置的
        * `<RecordBoardPagination />` 会优先使用它（详见 RecordBoardPagination 实现）。
        */
-      paginationRender: props.paginationRender
+      paginationRender: props.paginationRender,
+      gridInfiniteScroll: gridInfiniteScroll
     });
-  }, [layoutType, rowKeyProp, dataProp, dataSourcesProp, gridDataSourceKeyProp, loadingProp, totalProp, paginationProp, onPageChangeProp, searchParamsProp, onSearchProp, onResetProp, mergedChildComponentProps, internalSelectedKeys, internalSelectedRows, onSelectionChangeInternal, internalColumnVisibility, onColumnVisibilityChangeInternal, internalColumnOrder, onColumnOrderChangeInternal, fillHeight, scrollAreaHeight, filterResetKey, floorMapProp, floorMapLayoutContextProp, defaultBodyView, bodyViewSwitchable, floorMapLayoutRef, floorMapFooter, calendarProp, resourceWallProp, bodyView, setBodyView, props.paginationRender]);
+  }, [layoutType, rowKeyProp, dataProp, dataSourcesProp, gridDataSourceKeyProp, loadingProp, totalProp, paginationProp, onPageChangeProp, searchParamsProp, onSearchProp, onResetProp, mergedChildComponentProps, internalSelectedKeys, internalSelectedRows, onSelectionChangeInternal, internalColumnVisibility, onColumnVisibilityChangeInternal, internalColumnOrder, onColumnOrderChangeInternal, fillHeight, scrollAreaHeight, filterResetKey, floorMapProp, floorMapLayoutContextProp, defaultBodyView, bodyViewSwitchable, floorMapLayoutRef, floorMapFooter, calendarProp, resourceWallProp, bodyView, setBodyView, props.paginationRender, (_props$grid4 = props.grid) === null || _props$grid4 === void 0 ? void 0 : _props$grid4.infiniteScroll]);
   var content = /*#__PURE__*/React.createElement(RecordBoardProvider, {
     value: contextValue
   }, children);

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

@@ -1,5 +1,7 @@
 var _excluded = ["render", "columns", "rowKey", "rowSelection"],
-  _excluded2 = ["autoCalc"];
+  _excluded2 = ["autoCalc"],
+  _excluded3 = ["onScroll"],
+  _excluded4 = ["summary"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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; }
@@ -17,7 +19,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useMemo, useRef, useState, useEffect } from 'react';
-import { Table } from 'antd';
+import { Table, Spin } from 'antd';
 import { useRecordBoardContext } from "../../hooks/useRecordBoardContext";
 import { processColumnsForGrid, getRecordBoardColumnKey, computeUniformColumnSummary, isTrivialUniformSummaryReactContent } from "../../utils/recordBoardColumns";
 import { getText } from "../../../../locales";
@@ -37,9 +39,9 @@ function getRowKey(record, rowKey) {
  * Grid 布局下的数据视图：使用 antd Table，从 context 取 data / loading / 多选态。
  */
 /** Context 中与 Table 无关的 key，透传 Table 时排除，避免覆盖或无效传递（含 grid 合并进的 columns/scroll 等） */
-var CONTEXT_ONLY_KEYS = ['data', 'loading', 'total', 'pagination', 'onPageChange', 'searchParams', 'onSearch', 'onReset', 'layoutType', 'selectedKeys', 'selectedRows', 'onSelectionChange', 'rowKey', 'childComponentProps', 'columnVisibility', 'onColumnVisibilityChange', 'columns', 'scroll', 'size', 'defaultHiddenColumnKeys', 'scrollAreaHeight', 'setScrollAreaHeight', 'collapseUniformColumns', 'columnOrder', 'onColumnOrderChange'];
+var CONTEXT_ONLY_KEYS = ['data', 'loading', 'total', 'pagination', 'onPageChange', 'searchParams', 'onSearch', 'onReset', 'layoutType', 'selectedKeys', 'selectedRows', 'onSelectionChange', 'rowKey', 'childComponentProps', 'columnVisibility', 'onColumnVisibilityChange', 'columns', 'scroll', 'size', 'defaultHiddenColumnKeys', 'scrollAreaHeight', 'setScrollAreaHeight', 'collapseUniformColumns', 'columnOrder', 'onColumnOrderChange', 'gridInfiniteScroll', 'infiniteScroll', 'paginationRender'];
 var RecordBoardGridView = function RecordBoardGridView(props) {
-  var _ref2, _ctx$data2, _ctx$data3;
+  var _ref2, _ctx$data2, _ctx$data4;
   var ctx = useRecordBoardContext({
     displayName: 'grid'
   });
@@ -171,6 +173,7 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
   var gridTableProps = useMemo(function () {
     var picked = {};
     Object.keys(ctx).forEach(function (k) {
+      if (k === 'onScroll') return;
       if (CONTEXT_ONLY_KEYS.includes(k)) return;
       picked[k] = ctx[k];
     });
@@ -187,6 +190,7 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
       return sum + ((_col$width = col.width) !== null && _col$width !== void 0 ? _col$width : 250);
     }, 0) || 2000;
   }, [columns]);
+  var gridInfiniteScroll = ctx.gridInfiniteScroll === true;
 
   // 与 materials Table useGenScroll 对齐：autoCalc 时根据 scrollAreaHeight 计算 scroll.y；无数据且 scroll.x 非数字时用列宽之和避免表头被压窄换行
   var tableScroll = useMemo(function () {
@@ -200,7 +204,7 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
       return {
         x: scrollX !== null && scrollX !== void 0 ? scrollX : sumColumnWidths,
         y: Math.max(wrapHeight - reservedHeight, 100),
-        scrollToFirstRowOnChange: scroll.scrollToFirstRowOnChange
+        scrollToFirstRowOnChange: gridInfiniteScroll ? false : scroll.scrollToFirstRowOnChange
       };
     }
     if (scroll && _typeof(scroll) === 'object') {
@@ -212,13 +216,192 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
         var _ref6;
         return _objectSpread(_objectSpread({}, resolved), {}, {
           x: (_ref6 = scrollX !== null && scrollX !== void 0 ? scrollX : resolved.x) !== null && _ref6 !== void 0 ? _ref6 : sumColumnWidths
-        });
+        }, gridInfiniteScroll ? {
+          scrollToFirstRowOnChange: false
+        } : {});
       }
       return resolved;
     }
     return scroll;
-  }, [rest.scroll, ctx.scroll, ctx.scrollAreaHeight, ctx.pagination, columns, sumColumnWidths, isEmpty, uniformSummaryHeight]);
+  }, [rest.scroll, ctx.scroll, ctx.scrollAreaHeight, ctx.pagination, columns, sumColumnWidths, isEmpty, uniformSummaryHeight, gridInfiniteScroll]);
+
+  /** 触底加载下一页：距底部约 48px 内触发，避免 loading 与重复 onPageChange */
+  var infiniteLoadLockRef = useRef(false);
+  /** 已触发 onPageChange、等待下一页数据：宿主可能不设 ctx.loading，需单独驱动表尾「加载中」 */
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    infiniteScrollFetching = _useState4[0],
+    setInfiniteScrollFetching = _useState4[1];
+  // 与 dataSource.length 组合：宿主若不在请求期间置 loading，仅靠 loading 无法在下一次数据追加后清锁
+  useEffect(function () {
+    if (!ctx.loading) {
+      infiniteLoadLockRef.current = false;
+    }
+  }, [ctx.loading, dataSource.length]);
+  useEffect(function () {
+    setInfiniteScrollFetching(false);
+  }, [dataSource.length]);
+
+  /**
+   * 无限滚动：监听**实际发生滚动**的节点。
+   * - 有 `scroll.y` 时表体在内部滚动，类名在 ConfigProvider 下为 `.pisell-lowcode-table-body`（非 `.ant-table-body`）；
+   * - `scrollAreaHeight` 未就绪或仅 `autoCalc` 未算高时，整表在 Shell 的 `.pisell-record-board-scroll-body` 内滚，仅绑表体会漏事件（如 HUD 抽屉内嵌表）。
+   */
+  var gridWrapRef = useRef(null);
+  var ctxRef = useRef(ctx);
+  ctxRef.current = ctx;
+  var restRef = useRef(rest);
+  restRef.current = rest;
+  var gridInfiniteRef = useRef(false);
+  gridInfiniteRef.current = gridInfiniteScroll;
+  useEffect(function () {
+    if (!gridInfiniteScroll) return;
+    var root = gridWrapRef.current;
+    if (!root) {
+      return;
+    }
+    var handler = function handler(e) {
+      var _r$onScroll, _onScroll2, _ref7, _e$currentTarget, _c$data, _c$total;
+      var r = restRef.current;
+      var c = ctxRef.current;
+      var ev = e;
+      (_r$onScroll = r.onScroll) === null || _r$onScroll === void 0 || _r$onScroll.call(r, ev);
+      (_onScroll2 = (_ref7 = c).onScroll) === null || _onScroll2 === void 0 || _onScroll2.call(_ref7, ev);
+      if (!gridInfiniteRef.current) return;
+      if (c.loading || infiniteLoadLockRef.current) {
+        return;
+      }
+      var st = (_e$currentTarget = e.currentTarget) !== null && _e$currentTarget !== void 0 ? _e$currentTarget : e.target;
+      var dataLen = ((_c$data = c.data) !== null && _c$data !== void 0 ? _c$data : []).length;
+      var tot = (_c$total = c.total) !== null && _c$total !== void 0 ? _c$total : 0;
+      var scrollTop = st.scrollTop,
+        clientHeight = st.clientHeight,
+        scrollHeight = st.scrollHeight;
+      var dist = scrollHeight - scrollTop - clientHeight;
+      if (dataLen >= tot) {
+        return;
+      }
+      if (dist > 48) return;
+      infiniteLoadLockRef.current = true;
+      setInfiniteScrollFetching(true);
+      c.onPageChange(c.pagination.pageNumber + 1, c.pagination.pageSize);
+    };
+    var listScrollTargets = function listScrollTargets(r) {
+      var out = [];
+      var seen = new Set();
+      var add = function add(el) {
+        if (el && !seen.has(el)) {
+          seen.add(el);
+          out.push(el);
+        }
+      };
+      // 与 Grid.less 一致：项目 antd prefixCls 为 pisell-lowcode
+      r.querySelectorAll('.ant-table-body, .pisell-lowcode-table-body').forEach(function (n) {
+        return add(n);
+      });
+      add(r.closest('.pisell-record-board-scroll-body'));
+      return out;
+    };
+    var cleanups = [];
+    var bind = function bind() {
+      cleanups.forEach(function (fn) {
+        return fn();
+      });
+      cleanups.length = 0;
+      var targets = listScrollTargets(root);
+      targets.forEach(function (el) {
+        el.addEventListener('scroll', handler, {
+          passive: true
+        });
+        cleanups.push(function () {
+          return el.removeEventListener('scroll', handler);
+        });
+      });
+    };
+    var t0 = window.setTimeout(function () {
+      return bind();
+    }, 0);
+    var t1 = window.setTimeout(function () {
+      return bind();
+    }, 120);
+    var t2 = window.setTimeout(function () {
+      return bind();
+    }, 400);
+    return function () {
+      clearTimeout(t0);
+      clearTimeout(t1);
+      clearTimeout(t2);
+      cleanups.forEach(function (fn) {
+        return fn();
+      });
+    };
+  }, [gridInfiniteScroll, dataSource.length, isEmpty, ctx.scrollAreaHeight, columns, summaryItems.length]);
+  var tableRest = useMemo(function () {
+    if (!gridInfiniteScroll) return rest;
+    var _ref8 = rest,
+      _onScroll = _ref8.onScroll,
+      r = _objectWithoutProperties(_ref8, _excluded3);
+    return r;
+  }, [gridInfiniteScroll, rest]);
+  var userGridSummary = gridTableProps.summary;
+  var infiniteSummaryColSpan = useMemo(function () {
+    var n = Array.isArray(columns) ? columns.length : 1;
+    return n + (rowSelection ? 1 : 0);
+  }, [columns, rowSelection]);
+
+  /** 无限滚动：在 Table.Summary 内展示状态（与宿主 summary 合并） */
+  var mergedTableSummary = useMemo(function () {
+    if (!gridInfiniteScroll) {
+      return userGridSummary;
+    }
+    return function (pageData) {
+      var _ctx$data3;
+      var userNode = typeof userGridSummary === 'function' ? userGridSummary(pageData) : userGridSummary;
+      var len = ((_ctx$data3 = ctx.data) !== null && _ctx$data3 !== void 0 ? _ctx$data3 : []).length;
+      var tot = ctx.total;
+      var loading = !!ctx.loading;
+      var loadingMore = loading || infiniteScrollFetching;
+      var showBar = len > 0 || loadingMore;
+      if (!showBar && !userNode) {
+        return null;
+      }
+      var hasMore = tot == null || typeof tot !== 'number' ? true : len < tot;
+      var allLoaded = typeof tot === 'number' && tot > 0 && len > 0 && len >= tot;
+      var statusInner = null;
+      if (showBar) {
+        // 先有「已全部加载」再判断加载：只要还有总数意义上的后续条（hasMore）且本地已有展示行，表尾一律显示加载中（含未到触底、未置 loading / 未打 fetching 的中间态）
+        if (allLoaded) {
+          statusInner = /*#__PURE__*/React.createElement("span", {
+            className: "pisell-record-board-infinite-scroll-tip-done"
+          }, getText('record-board-infinite-scroll-all-loaded'));
+        } else if (hasMore && len > 0) {
+          statusInner = /*#__PURE__*/React.createElement("span", {
+            className: "pisell-record-board-infinite-scroll-tip-loading"
+          }, /*#__PURE__*/React.createElement(Spin, {
+            size: "small"
+          }), /*#__PURE__*/React.createElement("span", null, getText('record-board-infinite-scroll-loading-more')));
+        }
+      }
+      var statusBlock = statusInner != null ? /*#__PURE__*/React.createElement(Table.Summary, {
+        fixed: "bottom"
+      }, /*#__PURE__*/React.createElement(Table.Summary.Row, {
+        className: "pisell-record-board-infinite-scroll-summary-row"
+      }, /*#__PURE__*/React.createElement(Table.Summary.Cell, {
+        index: 0,
+        colSpan: infiniteSummaryColSpan,
+        align: "left"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "pisell-record-board-infinite-scroll-tip"
+      }, statusInner)))) : null;
+      if (!userNode && !statusBlock) return null;
+      return /*#__PURE__*/React.createElement(React.Fragment, null, userNode, statusBlock);
+    };
+  }, [gridInfiniteScroll, userGridSummary, infiniteSummaryColSpan, ctx.data, ctx.total, ctx.loading, infiniteScrollFetching]);
+  var _ref9 = gridTableProps,
+    _userSummaryOmitted = _ref9.summary,
+    gridTablePropsWithoutSummary = _objectWithoutProperties(_ref9, _excluded4);
   return /*#__PURE__*/React.createElement("div", {
+    ref: gridWrapRef,
     "data-layout-slot": "grid",
     className: "pisell-lowcode-record-board-grid"
   }, summaryItems.length > 0 && /*#__PURE__*/React.createElement("div", {
@@ -240,10 +423,11 @@ var RecordBoardGridView = function RecordBoardGridView(props) {
     }, item.title), /*#__PURE__*/React.createElement("span", {
       className: "pisell-record-board-uniform-summary-value"
     }, content));
-  })), /*#__PURE__*/React.createElement(Table, _extends({}, rest, gridTableProps, {
+  })), /*#__PURE__*/React.createElement(Table, _extends({}, tableRest, gridTablePropsWithoutSummary, {
+    summary: mergedTableSummary,
     scroll: tableScroll,
     rowKey: tableRowKey,
-    dataSource: (_ctx$data3 = ctx.data) !== null && _ctx$data3 !== void 0 ? _ctx$data3 : [],
+    dataSource: (_ctx$data4 = ctx.data) !== null && _ctx$data4 !== void 0 ? _ctx$data4 : [],
     loading: ctx.loading,
     columns: columns,
     rowSelection: rowSelection,

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

@@ -111,3 +111,34 @@
 .pisell-record-board-row-cancelled {
   background: #fff1f0;
 }
+
+// 无限滚动：表尾 Table.Summary 一行，文案靠左
+// 不再加 border-top：上方数据行已有 border-bottom，再画 top 会与 antd 格线叠成双线
+.pisell-record-board-infinite-scroll-summary-row > .pisell-lowcode-table-cell,
+.pisell-record-board-infinite-scroll-summary-row > .ant-table-cell {
+  background: var(--ant-color-bg-container, #ffffff) !important;
+  border-top: none !important;
+  text-align: left !important;
+  vertical-align: middle;
+  padding: 8px 12px !important;
+}
+
+.pisell-record-board-infinite-scroll-tip {
+  display: inline-flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 8px;
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.pisell-record-board-infinite-scroll-tip-loading {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  color: #475467;
+}
+
+.pisell-record-board-infinite-scroll-tip-done {
+  color: #667085;
+}

package/es/components/pisellRecordBoard/shellFrame/Calendar/view/BookingCalendarMonthView.js

@@ -71,12 +71,15 @@ export function BookingCalendarMonthView(_ref) {
       className: "h-3 w-3 rounded-full bg-violet-500"
     }), (day.blockCount > 0 || day.fullyBooked) && /*#__PURE__*/React.createElement("span", {
       className: "h-3 w-3 rounded-full bg-red-500"
-    })), dayItems.length > 0 ? /*#__PURE__*/React.createElement("div", {
-      className: "mt-10 flex w-full flex-col items-start gap-1.5"
+    })), dayItems.length > 0 ?
+    /*#__PURE__*/
+    /** 顶对齐：日期区为 top-3(12px) + h-11(44px)=56px，原先 mt-10(40px) 与数字圈底不齐，易多出一条缝 */
+    React.createElement("div", {
+      className: "mt-14 flex w-full flex-col items-start gap-1.5"
     }, dayItems.map(function (item, i) {
       var isLastVisible = i === dayItems.length - 1;
       var shrinkForMore = showMoreTile && isLastVisible;
-      var layoutClassName = "block rounded-md px-2 py-2 text-xs text-left ".concat(getGridBookingRowStateClasses(item), " ").concat(shrinkForMore ? 'flex-1 min-w-0' : 'w-full');
+      var layoutClassName = "block rounded-md px-2 pt-1.5 pb-2 text-xs text-left ".concat(getGridBookingRowStateClasses(item), " ").concat(shrinkForMore ? 'flex-1 min-w-0' : 'w-full');
       return /*#__PURE__*/React.createElement("div", {
         key: i,
         className: "flex w-full items-stretch gap-2"

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

@@ -167,6 +167,9 @@ var RecordBoardShellFrame = function RecordBoardShellFrame(_ref2) {
   var showGrid = useMemo(function () {
     return hasGridContent && ctx.bodyView === 'grid';
   }, [hasGridContent, ctx.bodyView]);
+
+  /** 无限滚动时不展示底部分页（含 paginationRender 挂载点） */
+  var showGridPagination = showGrid && ctx.gridInfiniteScroll !== true;
   var showFloorMap = useMemo(function () {
     return hasFloorMapSlot && effectiveFloorMapProps != null && ctx.bodyView === 'floorMap';
   }, [hasFloorMapSlot, effectiveFloorMapProps, ctx.bodyView]);
@@ -259,7 +262,7 @@ var RecordBoardShellFrame = function RecordBoardShellFrame(_ref2) {
   var 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 : function () {},
     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) : showResourceWall ? resourceWallNode : showCalendar ? calendarNode : floorMapNode, showGrid ? /*#__PURE__*/React.createElement(RecordBoardPagination, null) : null) : /*#__PURE__*/React.createElement(React.Fragment, null, showGrid ? gridChildren : showResourceWall ? resourceWallNode : 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);
   var shellStyle = fillHeight && style ? _objectSpread(_objectSpread({}, style), FILL_HEIGHT_WRAPPER_STYLE) : fillHeight ? FILL_HEIGHT_WRAPPER_STYLE : style;
   var wrapper = /*#__PURE__*/React.createElement(RecordBoardShellBodyMetaContext.Provider, {
     value: shellBodyMeta

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

@@ -540,6 +540,10 @@ export interface RecordBoardContextValue {
      * `<RecordBoardPagination />` 优先级：组件 `render` prop > 此 ctx 字段 > 默认 materials Pagination。
      */
     paginationRender?: (ctx: RecordBoardContextValue) => React.ReactNode;
+    /**
+     * 与 `grid.infiniteScroll` 同步：为 true 时不渲染 ShellFrame 底部分页，由 Grid 表体触底触发翻页。
+     */
+    gridInfiniteScroll?: boolean;
     /** 是否占满父容器高度，供 ShellFrame 做弹性布局（内容区纯 CSS 滚动 + 表头 sticky；scroll.autoCalc 时用测量高度） */
     fillHeight?: boolean;
     /** 内容区滚动容器高度（fillHeight 且 grid.scroll.autoCalc 时由 ShellFrame 测量），供 Grid 计算 scroll.y */
@@ -658,6 +662,11 @@ export declare type RecordBoardGridProps = {
         autoCalc?: boolean;
         scrollToFirstRowOnChange?: boolean;
     };
+    /**
+     * 为 true 时：表体滚动触底触发 `onPageChange` 加载下一页，ShellFrame **不展示**底部分页条。
+     * 宿主需保证 `data` 为已加载的**累积**行（或 dataSources 模式由容器做累积切片），且 `total` 为总量；触底停更条件为 `data.length < total`。
+     */
+    infiniteScroll?: boolean;
     /** 表格尺寸 */
     size?: 'small' | 'middle' | 'default';
     /** 当前选中的行 key 列表（多选） */

package/es/components/pisellTimeNavigator/PisellTimeNavigator.js

@@ -92,21 +92,33 @@ export function PisellTimeNavigator(props) {
     densityLoaded = _useState2[0],
     setDensityLoaded = _useState2[1];
   var densityReqId = useRef(0);
+  /**
+   * 仅当日历锚定日或 step 变化时清空密度折线；`loadDensity` 回调因上游 deps 变引用而变时
+   * 保留上一帧数据直至新请求返回，避免预约页列表/高光周期性更新导致整轴「闪一下」。
+   */
+  var densityAxisKeyRef = useRef(null);
   var densityGradientId = useMemo(function () {
     return "pisell-time-density-fill-".concat(Math.random().toString(36).slice(2, 8));
   }, []);
   useEffect(function () {
+    var axisKey = "".concat(referenceDayKey, "|").concat(stepMinutes);
+    var axisKeyChanged = densityAxisKeyRef.current === null || densityAxisKeyRef.current !== axisKey;
     if (densitySeriesProp !== undefined) {
+      densityAxisKeyRef.current = null;
       setDensityLoaded(undefined);
       return;
     }
     if (!loadDensityProp) {
+      densityAxisKeyRef.current = null;
       setDensityLoaded(undefined);
       return;
     }
+    densityAxisKeyRef.current = axisKey;
     var req = ++densityReqId.current;
     var cancelled = false;
-    setDensityLoaded(undefined);
+    if (axisKeyChanged) {
+      setDensityLoaded(undefined);
+    }
     var refDay = dayjs(referenceDayKey).startOf('day');
     void loadDensityProp({
       referenceDate: refDay,