@pisell/private-materials 6.11.143 → 6.11.144

package/es/plus/pisellReservation/PisellReservation.js

@@ -79,6 +79,13 @@ import { queryProductsByIds } from "./serve/productQuery";
 import { collectLinkProductIdsFromReservationRules, pickFirstDurationProduct } from "./data/reservationRuleProducts";
 import { mapAssociatedMenusToMenuListIds } from "./data/associatedMenuListIdsFromOpenData";
 
+/**
+ * 临时：HUD 抽屉打开时，隐藏抽屉内的 Today 统计条（ShellFrame `belowToolbar`）
+ * 与右侧资源快筛竖栏（`ReservationHudDrawerResourceRail`）。
+ * 关闭抽屉仍可用 mask / 顶抓手 / ESC。恢复时改为 `false`。
+ */
+var TEMP_HIDE_HUD_DRAWER_INNER_STATS_AND_RESOURCE_RAIL = true;
+
 /** 日历浮点小时 → dayjs（与 RecordBoard `dayAndHourToDayjs` 一致） */
 function dayjsFromCalendarHour(dateStr, hourFloat) {
   var h = Math.floor(hourFloat);
@@ -357,7 +364,6 @@ export var PisellReservationCore = function PisellReservationCore(props) {
 
   var isInternalListData = shouldUseBuiltinReservationList(dataProp, totalProp, paginationProp, onPageChangeProp);
   var resolvedFloorPlanId = floorPlanIdProp === null ? null : floorPlanIdProp === undefined ? RESERVATION_DEFAULT_FLOOR_PLAN_ID : floorPlanIdProp;
-  var effectiveFloorPlanCode = floorPlanCode !== null && floorPlanCode !== void 0 ? floorPlanCode : PISELL_RESERVATION_FLOOR_PLAN_CODE;
 
   // --- 引擎：locale、request、路由（新建预约）、勿将 pisellos 作 effect 依赖 ---
 
@@ -381,6 +387,13 @@ export var PisellReservationCore = function PisellReservationCore(props) {
       business_code: s
     };
   }, [BIZ]);
+
+  /**
+   * effectiveFloorPlanCode：用作按 code 拉/创建店铺平面图的 code。
+   * 优先级：路由 business_code → props.floorPlanCode → 兜底常量。
+   * 当 GET 404 时 `ensureShopFloorPlanByCode` 会用同一 code 走 POST 兜底创建。
+   */
+  var effectiveFloorPlanCode = BIZ || floorPlanCode || PISELL_RESERVATION_FLOOR_PLAN_CODE;
   var muiDatePickerAdapterLocale = useMemo(function () {
     var loc = String(engineLocale).toLowerCase();
     if (loc.startsWith('zh-cn')) return 'zh-cn';
@@ -2129,7 +2142,7 @@ export var PisellReservationCore = function PisellReservationCore(props) {
     bodyViewSwitchable: false,
     lockedBodyView: "grid"
   }, /*#__PURE__*/React.createElement(PisellRecordBoard.ShellFrame, {
-    belowToolbar: /*#__PURE__*/React.createElement(ReservationFloorMapHudTitleBar, {
+    belowToolbar: TEMP_HIDE_HUD_DRAWER_INNER_STATS_AND_RESOURCE_RAIL ? undefined : /*#__PURE__*/React.createElement(ReservationFloorMapHudTitleBar, {
       items: hudMapItems,
       dataSources: dataSources,
       actionMode: "collapse",
@@ -2137,7 +2150,7 @@ export var PisellReservationCore = function PisellReservationCore(props) {
       embedded: true,
       className: "pisell-reservation-hud-drawer-stats-inner"
     })
-  }, /*#__PURE__*/React.createElement(PisellRecordBoard.GridLayout, null)))), floorMapHudTableDrawer ? /*#__PURE__*/React.createElement(ReservationHudDrawerResourceRail, {
+  }, /*#__PURE__*/React.createElement(PisellRecordBoard.GridLayout, null)))), floorMapHudTableDrawer && !TEMP_HIDE_HUD_DRAWER_INNER_STATS_AND_RESOURCE_RAIL ? /*#__PURE__*/React.createElement(ReservationHudDrawerResourceRail, {
     className: "pisell-reservation-hud-drawer-resource-rail",
     buckets: hudDrawerResourceRootBuckets,
     value: extractFilterFormRecordIds(hudDrawerLocalSearchParams),

package/es/plus/pisellReservation/floorMap/useReservationFloorMapMerged.js

@@ -121,8 +121,7 @@ export function useReservationFloorMapMerged(params) {
         showZoom: true,
         showReset: true,
         showFitBounds: true,
-        showGridToggle: true,
-        horizontalAlign: 'end'
+        showGridToggle: true
       }, floorRest.controls),
       pan: _objectSpread({
         enabled: true,

package/es/plus/pisellReservation/floorRoomCard/FloorRoomCardFromData.js

@@ -2,13 +2,13 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _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); }
 /**
  * 由 {@link FloorRoomCardData} 渲染 RoomCard 内容（Shell + HeaderView + BodyView），
  * 不含根节点 `pisell-res-floor-room-card`、不含每分钟 tick；平面图容器与弹窗分别外包。
@@ -29,7 +29,6 @@ var I18N_STATUS_LOCK = 'pisell-reservation.room-status-locked';
 var I18N_VIEW_ALL = 'pisell-reservation.room-view-all';
 var I18N_MODAL_BOOKINGS = 'pisell-reservation.room-modal-bookings';
 var I18N_NEXT = 'pisell-reservation.room-next-prefix';
-var I18N_EMPTY_BODY = 'pisell-reservation.room-empty-body';
 function i18nN(key, n) {
   return locales.getText(key).replace(/\{n\}/g, String(n));
 }
@@ -219,11 +218,12 @@ function StandardCard(props) {
 }
 function EmptyCard(props) {
   var data = props.data,
-    _props$shellShape3 = props.shellShape,
-    shellShape = _props$shellShape3 === void 0 ? 'rect' : _props$shellShape3,
     hideHeaderCapacity = props.hideHeaderCapacity,
     headerMainFieldOverride = props.headerMainFieldOverride;
-  var isCircle = shellShape === 'circle';
+  /**
+   * 空态卡片仅保留顶部信息条 + 空态轮廓；方桌 / 圆桌都不再展示「暂无预约」正文 chip
+   * （早前圆桌已先行移除，方桌按 260415 反馈一并去掉，避免空白区域里的冗余文案）。
+   */
   return /*#__PURE__*/React.createElement(RoomCardShellView, {
     className: "rc rc--empty",
     header: /*#__PURE__*/React.createElement(CardHeader, {
@@ -231,17 +231,12 @@ function EmptyCard(props) {
       hideCapacity: hideHeaderCapacity,
       headerMainFieldOverride: headerMainFieldOverride
     })
-  }, isCircle ? null : /*#__PURE__*/React.createElement("div", _extends({
-    className: "rc-body rc-body--center",
-    "data-pisell-floor-room-scroll-surface": ""
-  }, floorCardStopCanvasPanHandlers), /*#__PURE__*/React.createElement("span", {
-    className: "rc-empty-text"
-  }, locales.getText(I18N_EMPTY_BODY))));
+  });
 }
 function MultiOccupiedCard(props) {
   var data = props.data,
-    _props$shellShape4 = props.shellShape,
-    shellShape = _props$shellShape4 === void 0 ? 'rect' : _props$shellShape4,
+    _props$shellShape3 = props.shellShape,
+    shellShape = _props$shellShape3 === void 0 ? 'rect' : _props$shellShape3,
     elementLayoutHeightPx = props.elementLayoutHeightPx,
     hideHeaderCapacity = props.hideHeaderCapacity,
     headerMainFieldOverride = props.headerMainFieldOverride;
@@ -324,8 +319,8 @@ function MultiOccupiedCard(props) {
 }
 function MultiReservedCard(props) {
   var data = props.data,
-    _props$shellShape5 = props.shellShape,
-    shellShape = _props$shellShape5 === void 0 ? 'rect' : _props$shellShape5,
+    _props$shellShape4 = props.shellShape,
+    shellShape = _props$shellShape4 === void 0 ? 'rect' : _props$shellShape4,
     elementLayoutHeightPx = props.elementLayoutHeightPx,
     hideHeaderCapacity = props.hideHeaderCapacity,
     headerMainFieldOverride = props.headerMainFieldOverride;
@@ -457,8 +452,8 @@ var SPECIAL_RENDERERS = {
  */
 export function FloorRoomCardFromData(props) {
   var data = props.data,
-    _props$shellShape6 = props.shellShape,
-    shellShape = _props$shellShape6 === void 0 ? 'rect' : _props$shellShape6,
+    _props$shellShape5 = props.shellShape,
+    shellShape = _props$shellShape5 === void 0 ? 'rect' : _props$shellShape5,
     elementLayoutHeightPx = props.elementLayoutHeightPx,
     _props$hideHeaderCapa2 = props.hideHeaderCapacity,
     hideHeaderCapacity = _props$hideHeaderCapa2 === void 0 ? false : _props$hideHeaderCapa2,

package/lib/plus/pisellReservation/PisellReservation.js

@@ -87,6 +87,7 @@ var import_formResourcePage = require("./serve/formResourcePage");
 var import_productQuery = require("./serve/productQuery");
 var import_reservationRuleProducts = require("./data/reservationRuleProducts");
 var import_associatedMenuListIdsFromOpenData = require("./data/associatedMenuListIdsFromOpenData");
+var TEMP_HIDE_HUD_DRAWER_INNER_STATS_AND_RESOURCE_RAIL = true;
 function dayjsFromCalendarHour(dateStr, hourFloat) {
   const h = Math.floor(hourFloat);
   const m = Math.round((hourFloat - h) * 60);
@@ -316,7 +317,6 @@ var PisellReservationCore = (props) => {
     onPageChangeProp
   );
   const resolvedFloorPlanId = floorPlanIdProp === null ? null : floorPlanIdProp === void 0 ? import_floorPlanApi.RESERVATION_DEFAULT_FLOOR_PLAN_ID : floorPlanIdProp;
-  const effectiveFloorPlanCode = floorPlanCode ?? import_floorPlanApi.PISELL_RESERVATION_FLOOR_PLAN_CODE;
   const engineCtx = (0, import_useEngineContext.default)();
   const pisellos = (0, import_useEngineContext.usePisellOS)();
   const pisellosRef = (0, import_react.useRef)(pisellos);
@@ -332,6 +332,7 @@ var PisellReservationCore = (props) => {
     if (!s) return {};
     return { business_code: s };
   }, [BIZ]);
+  const effectiveFloorPlanCode = BIZ || floorPlanCode || import_floorPlanApi.PISELL_RESERVATION_FLOOR_PLAN_CODE;
   const muiDatePickerAdapterLocale = (0, import_react.useMemo)(() => {
     const loc = String(engineLocale).toLowerCase();
     if (loc.startsWith("zh-cn")) return "zh-cn";
@@ -1992,7 +1993,7 @@ var PisellReservationCore = (props) => {
           /* @__PURE__ */ import_react.default.createElement(
             import_materials.PisellRecordBoard.ShellFrame,
             {
-              belowToolbar: /* @__PURE__ */ import_react.default.createElement(
+              belowToolbar: TEMP_HIDE_HUD_DRAWER_INNER_STATS_AND_RESOURCE_RAIL ? void 0 : /* @__PURE__ */ import_react.default.createElement(
                 import_ReservationFloorMapHud.ReservationFloorMapHudTitleBar,
                 {
                   items: hudMapItems,
@@ -2006,7 +2007,7 @@ var PisellReservationCore = (props) => {
             },
             /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.GridLayout, null)
           )
-        )), floorMapHudTableDrawer ? /* @__PURE__ */ import_react.default.createElement(
+        )), floorMapHudTableDrawer && !TEMP_HIDE_HUD_DRAWER_INNER_STATS_AND_RESOURCE_RAIL ? /* @__PURE__ */ import_react.default.createElement(
           import_ReservationHudDrawerResourceRail.ReservationHudDrawerResourceRail,
           {
             className: "pisell-reservation-hud-drawer-resource-rail",

package/lib/plus/pisellReservation/floorMap/useReservationFloorMapMerged.js

@@ -132,7 +132,7 @@ function useReservationFloorMapMerged(params) {
         showReset: true,
         showFitBounds: true,
         showGridToggle: true,
-        horizontalAlign: "end",
+        /* dockChrome 模式已强制锚定右下，无需再传 horizontalAlign */
         ...floorRest.controls
       },
       pan: {

package/lib/plus/pisellReservation/floorRoomCard/FloorRoomCardFromData.js

@@ -48,7 +48,6 @@ var I18N_STATUS_LOCK = "pisell-reservation.room-status-locked";
 var I18N_VIEW_ALL = "pisell-reservation.room-view-all";
 var I18N_MODAL_BOOKINGS = "pisell-reservation.room-modal-bookings";
 var I18N_NEXT = "pisell-reservation.room-next-prefix";
-var I18N_EMPTY_BODY = "pisell-reservation.room-empty-body";
 function i18nN(key, n) {
   return import_utils.locales.getText(key).replace(/\{n\}/g, String(n));
 }
@@ -213,8 +212,7 @@ function StandardCard(props) {
   );
 }
 function EmptyCard(props) {
-  const { data, shellShape = "rect", hideHeaderCapacity, headerMainFieldOverride } = props;
-  const isCircle = shellShape === "circle";
+  const { data, hideHeaderCapacity, headerMainFieldOverride } = props;
   return /* @__PURE__ */ import_react.default.createElement(
     import_RoomCardShellView.RoomCardShellView,
     {
@@ -227,16 +225,7 @@ function EmptyCard(props) {
           headerMainFieldOverride
         }
       )
-    },
-    isCircle ? null : /* @__PURE__ */ import_react.default.createElement(
-      "div",
-      {
-        className: "rc-body rc-body--center",
-        "data-pisell-floor-room-scroll-surface": "",
-        ...floorCardStopCanvasPanHandlers
-      },
-      /* @__PURE__ */ import_react.default.createElement("span", { className: "rc-empty-text" }, import_utils.locales.getText(I18N_EMPTY_BODY))
-    )
+    }
   );
 }
 function MultiOccupiedCard(props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.143",
+  "version": "6.11.144",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -68,7 +68,7 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.11.45",
+    "@pisell/materials": "6.11.46",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.8"
   },