@pisell/private-materials 6.11.143 → 6.11.145

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const CartItem: ({ onNext, renderContactInfo }: any) => JSX.Element;
 export default CartItem;

package/es/components/booking/components/footer/index.js

@@ -2577,7 +2577,7 @@ var Footer = function Footer(props) {
     },
     onChangeOrderNote: handleNoteConfirm,
     onDeleteOrderNote: handleNoteDelete,
-    onClose: function onClose(reset) {
+    onClose: function onClose(reset, options) {
       var _state$dialogCallback2;
       console.log('🔄 Footer: Closing PaymentModal', reset);
       setIsPaymentModalOpen(false);
@@ -2593,7 +2593,10 @@ var Footer = function Footer(props) {
       // 编辑模式弹窗回调（由 TicketBookingDialog 传入）
       state === null || state === void 0 || (_state$dialogCallback2 = state.dialogCallback) === null || _state$dialogCallback2 === void 0 || _state$dialogCallback2.call(state, {
         type: 'paymentClose',
-        reset: reset
+        reset: reset,
+        data: {
+          order_id: options === null || options === void 0 ? void 0 : options.order_id
+        }
       });
       // 清除编辑模式
       setEditOrderId(0);

package/es/components/checkout/PaymentModal.d.ts

@@ -25,7 +25,7 @@ interface PaymentModalProps {
     onDeleteOrderNote?: () => void;
 }
 interface PaymentModalMainProps extends PaymentModalProps {
-    onClose?: (reset?: boolean) => void;
+    onClose?: (reset?: boolean, options?: any) => void;
     onSetLocalOrderId?: (order_id: number) => void;
     setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
     editOrderId?: number;

package/es/components/checkout/PaymentModal.js

@@ -1581,7 +1581,7 @@ var PaymentModal = function PaymentModal(_ref19) {
   // 重试处理函数（逻辑由用户自己实现）
   var handleRetry = /*#__PURE__*/function () {
     var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-      var checkoutModule, res, _res$response;
+      var checkoutModule, res, _res$response, _res$response2;
       return _regeneratorRuntime().wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
           case 0:
@@ -1610,7 +1610,9 @@ var PaymentModal = function PaymentModal(_ref19) {
           case 9:
             // 如果是整单支付，则调用 onClose 让外面清空购物车
             if ((res === null || res === void 0 || (_res$response = res.response) === null || _res$response === void 0 || (_res$response = _res$response.data) === null || _res$response === void 0 ? void 0 : _res$response.payment_status) === 'paid') {
-              onClose === null || onClose === void 0 || onClose(true);
+              onClose === null || onClose === void 0 || onClose(true, {
+                order_id: res === null || res === void 0 || (_res$response2 = res.response) === null || _res$response2 === void 0 || (_res$response2 = _res$response2.data) === null || _res$response2 === void 0 ? void 0 : _res$response2.order_id
+              });
             }
             // if (res.data.payment_status)
             // setShowRetryModal(false);
@@ -2063,9 +2065,12 @@ var PaymentModal = function PaymentModal(_ref19) {
   };
 
   // 专门用于关闭PaymentModal的函数
-  var handleModalClose = function handleModalClose() {
+  var handleModalClose = function handleModalClose(res) {
+    var _res$response3;
     console.log('PaymentModal - Modal closing independently');
-    onClose === null || onClose === void 0 || onClose(true);
+    onClose === null || onClose === void 0 || onClose(true, {
+      order_id: res === null || res === void 0 || (_res$response3 = res.response) === null || _res$response3 === void 0 || (_res$response3 = _res$response3.data) === null || _res$response3 === void 0 ? void 0 : _res$response3.order_id
+    });
   };
   var handlePaymentCancel = function handlePaymentCancel(reset, notCancelOrder) {
     var _paymentContentRef$cu, _paymentContentRef$cu2;
@@ -2353,7 +2358,7 @@ var PaymentModal = function PaymentModal(_ref19) {
 
               // 当支付状态为 paid 时，关闭 paymentModal
               if (paymentStatus === 'paid') {
-                handleModalClose();
+                handleModalClose(data);
               }
 
               // 将支付结果信息传递给回调处理

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/reservationMock.d.ts

@@ -4,6 +4,8 @@ import type { PisellReservationTableRow } from '../types';
  * 父级/接口 elementKinds 与预约默认合并：
  * - 去掉与 Story 图片图元重复的旧版种类；
  * - 远程若已有 `floorMapImage` 也先去掉，统一用 defaults 里那份（避免两套「图片底图」并存）。
+ * - 对**同一 value**：用 `{ ...default, ...remote }` 合并，避免远程 JSON 只存了精简字段时
+ *   把预约默认里的 `nameAsTitleConfigurable` 等能力位整段丢掉（否则编辑面板不显示「图元名作为标题」勾选）。
  */
 export declare function mergeFloorMapElementKindsWithDefaults(defaults: FloorMapElementKindConfig[], remote: FloorMapElementKindConfig[] | undefined): FloorMapElementKindConfig[];
 /** 同上，补全图元分类（如「底图」），避免调色板分组缺失 */

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

@@ -1,9 +1,4 @@
 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); }
-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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 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."); }
@@ -11,6 +6,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _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 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); }
 import { FLOOR_MAP_IMAGE_ELEMENT_KIND } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import reservationLocales from "../locales/locales";
@@ -52,13 +52,25 @@ function dedupeElementKindsByValue(kinds) {
  * 父级/接口 elementKinds 与预约默认合并：
  * - 去掉与 Story 图片图元重复的旧版种类；
  * - 远程若已有 `floorMapImage` 也先去掉，统一用 defaults 里那份（避免两套「图片底图」并存）。
+ * - 对**同一 value**：用 `{ ...default, ...remote }` 合并，避免远程 JSON 只存了精简字段时
+ *   把预约默认里的 `nameAsTitleConfigurable` 等能力位整段丢掉（否则编辑面板不显示「图元名作为标题」勾选）。
  */
 export function mergeFloorMapElementKindsWithDefaults(defaults, remote) {
   if (!(remote !== null && remote !== void 0 && remote.length)) return defaults;
+  var defaultByValue = new Map(defaults.map(function (d) {
+    return [d.value, d];
+  }));
   var base = dedupeElementKindsByValue(stripConflictingImageElementKinds(remote)).filter(function (k) {
     return k.value !== FLOOR_MAP_IMAGE_ELEMENT_KIND;
   }).filter(function (k) {
     return !LEGACY_RESERVATION_TABLE_KIND_VALUES.has(k.value);
+  }).map(function (k) {
+    var _k$nameAsTitleConfigu;
+    var d = defaultByValue.get(k.value);
+    if (!d) return k;
+    return _objectSpread(_objectSpread(_objectSpread({}, d), k), {}, {
+      nameAsTitleConfigurable: (_k$nameAsTitleConfigu = k.nameAsTitleConfigurable) !== null && _k$nameAsTitleConfigu !== void 0 ? _k$nameAsTitleConfigu : d.nameAsTitleConfigurable
+    });
   });
   var seen = new Set(base.map(function (k) {
     return k.value;

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/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const CartItem: ({ onNext, renderContactInfo }: any) => JSX.Element;
 export default CartItem;

package/lib/components/booking/components/footer/index.js

@@ -1804,7 +1804,7 @@ var Footer = (props) => {
       },
       onChangeOrderNote: handleNoteConfirm,
       onDeleteOrderNote: handleNoteDelete,
-      onClose: (reset) => {
+      onClose: (reset, options) => {
         var _a2;
         console.log("🔄 Footer: Closing PaymentModal", reset);
         setIsPaymentModalOpen(false);
@@ -1814,7 +1814,13 @@ var Footer = (props) => {
         if (reset) {
           handleClearAllAndReset();
         }
-        (_a2 = state == null ? void 0 : state.dialogCallback) == null ? void 0 : _a2.call(state, { type: "paymentClose", reset });
+        (_a2 = state == null ? void 0 : state.dialogCallback) == null ? void 0 : _a2.call(state, {
+          type: "paymentClose",
+          reset,
+          data: {
+            order_id: options == null ? void 0 : options.order_id
+          }
+        });
         setEditOrderId(0);
       },
       onSetLocalOrderId: (e) => {

package/lib/components/checkout/PaymentModal.d.ts

@@ -25,7 +25,7 @@ interface PaymentModalProps {
     onDeleteOrderNote?: () => void;
 }
 interface PaymentModalMainProps extends PaymentModalProps {
-    onClose?: (reset?: boolean) => void;
+    onClose?: (reset?: boolean, options?: any) => void;
     onSetLocalOrderId?: (order_id: number) => void;
     setEditCartMode?: (order_id: number, payData: any, closeModal: boolean) => void;
     editOrderId?: number;

package/lib/components/checkout/PaymentModal.js

@@ -1191,7 +1191,7 @@ var PaymentModal = ({
   const { nativePrint } = (0, import_printer.default)();
   const businessCode = (0, import_OsKeyContext.useBusinessCode)();
   const handleRetry = async () => {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2;
     const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
     const res = await (checkoutModule == null ? void 0 : checkoutModule.manualSyncOrderAsync());
     console.log(res);
@@ -1199,7 +1199,9 @@ var PaymentModal = ({
       setShowRetryModal(false);
       await (showSuccessToast == null ? void 0 : showSuccessToast(res));
       if (((_b2 = (_a2 = res == null ? void 0 : res.response) == null ? void 0 : _a2.data) == null ? void 0 : _b2.payment_status) === "paid") {
-        onClose == null ? void 0 : onClose(true);
+        onClose == null ? void 0 : onClose(true, {
+          order_id: (_d2 = (_c2 = res == null ? void 0 : res.response) == null ? void 0 : _c2.data) == null ? void 0 : _d2.order_id
+        });
       }
     }
   };
@@ -1467,9 +1469,12 @@ var PaymentModal = ({
       callback == null ? void 0 : callback({ ...currentPaymentResultRef.current, isCallbackFromToast: true });
     }
   };
-  const handleModalClose = () => {
+  const handleModalClose = (res) => {
+    var _a2, _b2;
     console.log("PaymentModal - Modal closing independently");
-    onClose == null ? void 0 : onClose(true);
+    onClose == null ? void 0 : onClose(true, {
+      order_id: (_b2 = (_a2 = res == null ? void 0 : res.response) == null ? void 0 : _a2.data) == null ? void 0 : _b2.order_id
+    });
   };
   const handlePaymentCancel = (reset, notCancelOrder) => {
     var _a2, _b2;
@@ -1663,7 +1668,7 @@ var PaymentModal = ({
           );
           console.log("paymentStatus>>>>", paymentStatus);
           if (paymentStatus === "paid") {
-            handleModalClose();
+            handleModalClose(data2);
           }
           const paymentResult = {
             ...data2,

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/reservationMock.d.ts

@@ -4,6 +4,8 @@ import type { PisellReservationTableRow } from '../types';
  * 父级/接口 elementKinds 与预约默认合并：
  * - 去掉与 Story 图片图元重复的旧版种类；
  * - 远程若已有 `floorMapImage` 也先去掉，统一用 defaults 里那份（避免两套「图片底图」并存）。
+ * - 对**同一 value**：用 `{ ...default, ...remote }` 合并，避免远程 JSON 只存了精简字段时
+ *   把预约默认里的 `nameAsTitleConfigurable` 等能力位整段丢掉（否则编辑面板不显示「图元名作为标题」勾选）。
  */
 export declare function mergeFloorMapElementKindsWithDefaults(defaults: FloorMapElementKindConfig[], remote: FloorMapElementKindConfig[] | undefined): FloorMapElementKindConfig[];
 /** 同上，补全图元分类（如「底图」），避免调色板分组缺失 */

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

@@ -82,9 +82,18 @@ function dedupeElementKindsByValue(kinds) {
 }
 function mergeFloorMapElementKindsWithDefaults(defaults, remote) {
   if (!(remote == null ? void 0 : remote.length)) return defaults;
+  const defaultByValue = new Map(defaults.map((d) => [d.value, d]));
   const base = dedupeElementKindsByValue(
     stripConflictingImageElementKinds(remote)
-  ).filter((k) => k.value !== import_materials.FLOOR_MAP_IMAGE_ELEMENT_KIND).filter((k) => !LEGACY_RESERVATION_TABLE_KIND_VALUES.has(k.value));
+  ).filter((k) => k.value !== import_materials.FLOOR_MAP_IMAGE_ELEMENT_KIND).filter((k) => !LEGACY_RESERVATION_TABLE_KIND_VALUES.has(k.value)).map((k) => {
+    const d = defaultByValue.get(k.value);
+    if (!d) return k;
+    return {
+      ...d,
+      ...k,
+      nameAsTitleConfigurable: k.nameAsTitleConfigurable ?? d.nameAsTitleConfigurable
+    };
+  });
   const seen = new Set(base.map((k) => k.value));
   const out = [...base];
   for (const d of defaults) {

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.145",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -67,10 +67,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.11.45",
+    "@pisell/date-picker": "3.0.8",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.8"
+    "@pisell/utils": "3.0.2",
+    "@pisell/materials": "6.11.46"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/booking/info/service2/Group/utils.d.ts

@@ -1,14 +0,0 @@
-export declare const getGroupTotalPrice: (items: any[]) => any;
-/**
- * @title: 创建一个虚拟的组
- * @description:
- * @param {any} items
- * @return {*}
- * @Author: zhiwei.Wang
- */
-export declare const concatBookings: (items: any[]) => any;
-export declare const createBookingItemsByGroup: (item: any, isBatchEdit?: any) => any[];
-export declare const isGroupBooking: (_id: any) => boolean;
-export declare const getProductByGroupId: (groupId: string, items: any[]) => any[];
-export declare const getGroupBooking: (groupId: string, items: any[]) => any;
-export declare const filterItemByGroupId: (groupId: string, items: any[]) => any[];

package/es/components/pay/toB/paymentMethods/index.d.ts

@@ -1,11 +0,0 @@
-import React from 'react';
-import { ToBPayParams } from '../types';
-export interface PaymentMethodsRef {
-    onPay: (type: 'eftpos' | 'mx51', params: ToBPayParams) => void;
-}
-export interface PaymentMethodsProps {
-    dynamicMaxHeight?: string;
-    isWebPos?: boolean;
-}
-declare const _default: React.ForwardRefExoticComponent<PaymentMethodsProps & React.RefAttributes<PaymentMethodsRef>>;
-export default _default;

package/es/components/pay/toB/types/index.d.ts

@@ -1,82 +0,0 @@
-export * from './storeTypes';
-export interface ToBPayParams {
-    source?: 'normal' | 'restore';
-    data: {
-        type?: string;
-        payMethod: {
-            id: string;
-            code: string;
-            type: string;
-            name: string;
-        };
-        params: {
-            orderId?: string | number;
-            symbol?: string;
-            amount: string;
-            surcharge?: string;
-            [key: string]: any;
-        };
-        mode: 'pay' | 'refund';
-    };
-    callback: ToBPayCallback;
-}
-export declare type ToBPayCallback = (res: {
-    status: string;
-    data: {
-        amount: number;
-        surPercentRate?: number;
-        surMoney?: number;
-        surcharge?: number;
-        uniquePaymentNumber?: string;
-        /**
-         * @description
-         * 支付组件返回的额外动作指令（例如：取消订单并开始新订单）
-         * PaymentModal 里会根据该字段执行对应流程。
-         */
-        action?: 'cancel_order' | string;
-    };
-    msg?: string;
-}) => void;
-/**
- * @title: 支付打开参数
- */
-export interface PayOpenParams extends Omit<ToBPayParams, 'callback'> {
-    payCallback: (res: EftposPayResult | MX51PayResult) => void;
-}
-/**
- * @title: eftpos支付结果
- */
-export interface EftposPayResult {
-    status: 'success' | 'fail';
-    params: {
-        amount: number;
-        surPercentRate: number;
-        surMoney: number;
-        uniquePaymentNumber: string;
-    };
-}
-/**
- * @title: MX51支付结果
- */
-export interface MX51PayResult {
-    result: boolean;
-    msg?: string;
-    amount: number;
-    surcharge: number;
-    uniquePaymentNumber: string;
-    nativeTxId: string;
-    action?: 'cancel_order' | string;
-}
-/**
- * @title 原生MX51支付结果
- */
-export interface NativeMX51PayResult {
-    action?: 'cancel_order' | string;
-    code: string;
-    msg?: string;
-    data: {
-        amount: number;
-        surcharge: number;
-    };
-    uuid: string;
-}

package/es/plus/pisellReservation/PisellReservation.d.ts

@@ -1,11 +0,0 @@
-import React from 'react';
-import 'dayjs/locale/zh-cn';
-import 'dayjs/locale/en';
-import 'dayjs/locale/zh-tw';
-import type { PisellReservationProps } from './types';
-import './PisellReservation.less';
-/**
- * 预约看板 Core：内置 Sales 预约列表 + 时间轴 + 平面图。
- * 页面壳 {@link PisellReservationBookingPage} / {@link PisellVenueControlPage} / PisellVenueWallPage 通过 props 组合默认行为。
- */
-export declare const PisellReservationCore: React.FC<PisellReservationProps>;