@pisell/private-materials 6.1.6 → 6.1.8

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

@@ -0,0 +1,73 @@
+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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+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; }
+import React, { useState } from 'react';
+import { Modal } from 'antd';
+import { locales } from '@pisell/utils';
+import { WarningOutlined } from '@ant-design/icons';
+import "./index.less";
+var ReloadResourceModal = function ReloadResourceModal(_ref) {
+  var _modal$state$service;
+  var modal = _ref.modal,
+    onReload = _ref.onReload,
+    onCancel = _ref.onCancel;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var handleReload = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setLoading(true);
+            _context.prev = 1;
+            _context.next = 4;
+            return onReload === null || onReload === void 0 ? void 0 : onReload();
+          case 4:
+            _context.next = 8;
+            break;
+          case 6:
+            _context.prev = 6;
+            _context.t0 = _context["catch"](1);
+          case 8:
+            setLoading(false);
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1, 6]]);
+    }));
+    return function handleReload() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/React.createElement(Modal, {
+    className: "pisell-resource-reload-modal",
+    title: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(WarningOutlined, {
+      style: {
+        color: '#d89614',
+        marginRight: 8
+      }
+    }), locales.getText('pisell2.booking.info.resource.warning-title')),
+    cancelText: null,
+    okText: locales.getText('pisell2.booking.info.resource.retry'),
+    confirmLoading: loading,
+    open: (_modal$state$service = modal.state.service) === null || _modal$state$service === void 0 ? void 0 : _modal$state$service.reloadResourceModal,
+    onOk: handleReload,
+    cancelButtonProps: {
+      style: {
+        display: 'none'
+      }
+    },
+    onCancel: onCancel
+  }, /*#__PURE__*/React.createElement("div", null, locales.getText('pisell2.booking.info.resource.warning-content')));
+};
+export default ReloadResourceModal;

package/es/components/booking/components/reloadResourceModal/index.less

@@ -0,0 +1,6 @@
+.pisell-resource-reload-modal {
+
+  .pisell-lowcode-modal-header {
+    padding: 0;
+  }
+}

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

@@ -1,15 +1,63 @@
-import React from "react";
+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); }
+import React, { useMemo } from "react";
 import AuthWrap from "../authWrap";
 import { Skeleton } from "antd";
 import "./index.less";
 import classNames from "classnames";
+import useEngineContext from "../../../../hooks/useEngineContext";
+import VoucherCard from "../voucher";
+import ActionButtons from "../actionButtons";
 var TabPane = function TabPane(_ref) {
+  var _context$appHelper, _businessUtils$getApp, _businessUtils$getApp2, _state$service, _state$addons, _state$client, _state$service2, _state$addons2, _state$client2;
   var children = _ref.children,
     header = _ref.header,
     footer = _ref.footer,
     style = _ref.style,
     loading = _ref.loading,
-    bodyClassName = _ref.bodyClassName;
+    bodyClassName = _ref.bodyClassName,
+    state = _ref.state,
+    dispatch = _ref.dispatch,
+    source = _ref.source;
+  var context = useEngineContext();
+  var _ref2 = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    businessUtils = _ref2.businessUtils;
+
+  // 是否安装商品券应用
+  var hasGoodPassApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
+  var hasDiscountCardApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp2 = businessUtils.getAppByModal) !== null && _businessUtils$getApp2 !== void 0 && _businessUtils$getApp2.call(businessUtils, 'discountcard'));
+
+  // 支付退款状态
+  var paymentRefundedStatus = useMemo(function () {
+    var _state$bookingDetail;
+    return ['partially_refunded', 'refunded'].includes(state === null || state === void 0 || (_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status);
+  }, [state === null || state === void 0 ? void 0 : state.bookingDetail]);
+
+  // 是否显示 voucher 模块的基础条件
+  var voucherBaseCondition = (hasGoodPassApp || hasDiscountCardApp) && ['addons', 'info'].includes(source) && !paymentRefundedStatus;
+
+  // 票务预订显示独立的 voucher 模块
+  var shouldShowTerminalVoucher = voucherBaseCondition && (state === null || state === void 0 ? void 0 : state.isBookingTicket2);
+
+  // 非票务预订显示在 footer 中的 voucher 模块
+  var shouldShowFooterVoucher = voucherBaseCondition && !(state !== null && state !== void 0 && state.isBookingTicket2);
+
+  // 处理订单备注变更
+  var addNote = function addNote(noteValue) {
+    if (dispatch) {
+      dispatch({
+        type: 'setNotes',
+        payload: {
+          orderNote: noteValue,
+          edit: true
+        }
+      });
+    }
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-tab-pane-wrap",
     style: style
@@ -25,11 +73,44 @@ var TabPane = function TabPane(_ref) {
     style: {
       padding: 20
     }
-  }, children)), /*#__PURE__*/React.createElement(AuthWrap, {
-    show: !!footer,
+  }, children)), shouldShowTerminalVoucher && state && dispatch && /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-tab-pane-voucher-section"
+  }, /*#__PURE__*/React.createElement(VoucherCard, {
+    state: _objectSpread(_objectSpread({}, state), {}, {
+      service: _objectSpread(_objectSpread({}, state.service || {}), {}, {
+        value: ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []
+      }),
+      addons: _objectSpread(_objectSpread({}, state.addons || {}), {}, {
+        value: ((_state$addons = state.addons) === null || _state$addons === void 0 ? void 0 : _state$addons.value) || []
+      }),
+      client: _objectSpread(_objectSpread({}, state.client || {}), {}, {
+        value: ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {}
+      })
+    }),
+    dispatch: dispatch,
+    source: source
+  }), /*#__PURE__*/React.createElement(ActionButtons, {
+    state: state,
+    dispatch: dispatch
+  })), /*#__PURE__*/React.createElement(AuthWrap, {
+    show: !!footer || shouldShowFooterVoucher,
     trueRender: /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-tab-pane-footer"
-    }, footer)
+    }, shouldShowFooterVoucher && state && dispatch && /*#__PURE__*/React.createElement(VoucherCard, {
+      state: _objectSpread(_objectSpread({}, state), {}, {
+        service: _objectSpread(_objectSpread({}, state.service || {}), {}, {
+          value: ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []
+        }),
+        addons: _objectSpread(_objectSpread({}, state.addons || {}), {}, {
+          value: ((_state$addons2 = state.addons) === null || _state$addons2 === void 0 ? void 0 : _state$addons2.value) || []
+        }),
+        client: _objectSpread(_objectSpread({}, state.client || {}), {}, {
+          value: ((_state$client2 = state.client) === null || _state$client2 === void 0 ? void 0 : _state$client2.value) || {}
+        })
+      }),
+      dispatch: dispatch,
+      source: source
+    }), footer)
   })));
 };
 export default TabPane;

package/es/components/booking/components/tabPane/index.less

@@ -5,7 +5,6 @@
   position: relative;
   display: flex;
   flex-direction: column;
-
 }
 
 .pisell-lowcode__booking-tab-pane-title {
@@ -30,6 +29,8 @@
   flex: 1;
   overflow: auto;
   padding: 0 32px;
+  // 为 voucher-section 预留空间
+  padding-bottom: 120px;
 
   .pisell-lowcode__booking-tab-pane-label {
     font-size: 16px;
@@ -45,6 +46,79 @@
   }
 }
 
+// Voucher 和功能按钮区域
+.pisell-lowcode__booking-tab-pane-voucher-section {
+  display: flex;
+  flex-direction: column;
+  padding: 8px 16px;
+  position: relative;
+  z-index: 3;
+  background-color: #1b1b1b;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06);
+  
+  .pisell-lowcode__booking-footer-voucher-container {
+    background: var(--base-white, #FFF);
+    padding: 4px;
+    border-radius: 8px;
+  }
+  
+  // ActionButtons 在 voucher-section 中的样式
+  .pisell-lowcode__action-buttons {
+    margin-top: 8px;
+    // 确保按钮可见
+    .action-button {
+      // 重要：确保文字颜色在深色背景下可见
+      color: white !important;
+      
+      &:hover:not(:disabled) {
+        color: white !important;
+      }
+    }
+  }
+}
+
+// 订单备注区域
+.pisell-lowcode__booking-tab-pane-notes-section {
+  background-color: #1b1b1b;
+  position: relative;
+  z-index: 3;
+  
+  .pisell-lowcode__booking-notes {
+    background: var(--base-white, #FFF);
+    padding: 12px;
+    width: 100%;
+    
+    .pisell-lowcode__booking-notes-label {
+      font-weight: 500;
+      color: #333;
+      margin-bottom: 8px;
+    }
+    
+    .pisell-lowcode__booking-notes-input {
+      .pisell-lowcode-input {
+        height: 44px !important;
+        min-height: 44px !important;
+        border-radius: 6px;
+        font-size: 16px;
+        line-height: 36px;
+      }
+      
+      // 备用选择器，以防万一
+      textarea.pisell-lowcode-input {
+        height: 44px !important;
+        min-height: 44px !important;
+        border-radius: 6px;
+        resize: none;
+      }
+      
+      // 去掉外层包装容器的边框
+      .pisell-lowcode-input-textarea-affix-wrapper {
+        border-width: 1px;
+      }
+    }
+  }
+}
+
 .pisell-lowcode__booking-tab-pane-footer {
   position: sticky;
   bottom: 0;

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

@@ -26,8 +26,9 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials';
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
-import { getServiceAddons } from "./utils";
 import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
+import { getServiceAddons } from "./utils";
+import { useCustomer } from "../../../ticketBooking/hooks/pisellos";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -65,6 +66,21 @@ var VoucherCard = function VoucherCard(props) {
   var shopDiscount = pisellos.getModule('shopDiscount');
   services = state.service;
 
+  // 将选中的客户数据传递给状态管理
+  var changeCustomerToGlobalState = useMemoizedFn(function (value) {
+    dispatch({
+      type: 'setClient',
+      payload: {
+        value: value,
+        edit: true
+      }
+    });
+  });
+  var _useCustomer = useCustomer({
+      changeCustomerToGlobalState: changeCustomerToGlobalState
+    }),
+    selectCustomer = _useCustomer.selectCustomer;
+
   // 设置client
   useDebounceEffect(function () {
     if (isBooking4Shop) {
@@ -90,7 +106,8 @@ var VoucherCard = function VoucherCard(props) {
         price: value.price,
         total: value === null || value === void 0 || (_value$_extend = value._extend) === null || _value$_extend === void 0 ? void 0 : _value$_extend.total,
         discount_list: value.discount_list,
-        origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total
+        origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total,
+        quantity: value._extend.quantity
       };
     });
     return val;
@@ -156,13 +173,7 @@ var VoucherCard = function VoucherCard(props) {
   useEffect(function () {
     if (!isBooking4Shop) return;
     var onScanCustomerChange = function onScanCustomerChange(customer) {
-      // 更新客户
-      dispatch({
-        type: 'setClient',
-        payload: {
-          value: customer
-        }
-      });
+      selectCustomer(customer);
     };
     var onDiscountListChange = function onDiscountListChange(discount) {
       setDisCountList(discount);
@@ -275,8 +286,8 @@ var VoucherCard = function VoucherCard(props) {
     style: {
       width: '100%'
     },
-    mixedSort: mixedSort,
     dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
+    mixedSort: mixedSort,
     onChange: function onChange(val) {
       var shopDiscount = pisellos.getModule('shopDiscount');
       var detail = shopDiscount.setDiscountSelected({

package/es/components/booking/components/voucher/index.less

@@ -4,7 +4,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 10px;
+    margin-bottom: 0px;
 
     .voucher-title-left {
       color: var(--base-black, #000);

package/es/components/booking/dashboard/index.d.ts

@@ -16,5 +16,5 @@ export interface BookingDashboardProps extends React.HTMLAttributes<HTMLDivEleme
         departed: string | number;
     }, dataList: string[]) => void;
 }
-declare const BookingDashboard: (props: BookingDashboardProps) => JSX.Element;
+declare const BookingDashboard: React.ForwardRefExoticComponent<BookingDashboardProps & React.RefAttributes<unknown>>;
 export default BookingDashboard;

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

@@ -21,7 +21,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 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, { useEffect, useState } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
 import { PisellStatisticList } from '@pisell/materials';
 import { isArr, locales } from '@pisell/utils';
 import dayjs from 'dayjs';
@@ -52,7 +52,7 @@ var formatCapacityToChildrenData = function formatCapacityToChildrenData(data) {
   });
 };
 locales.init(localeTexts, getLocale());
-var BookingDashboard = function BookingDashboard(props) {
+var BookingDashboard = /*#__PURE__*/forwardRef(function (props, ref) {
   var _props$otherParams = props.otherParams,
     otherParams = _props$otherParams === void 0 ? {} : _props$otherParams,
     backgroundColors = props.backgroundColors,
@@ -292,11 +292,18 @@ var BookingDashboard = function BookingDashboard(props) {
       clearInterval(timer);
     };
   }, [JSON.stringify(otherParams), refreshKey]);
+  useImperativeHandle(ref, function () {
+    return {
+      refresh: function refresh() {
+        getData();
+      }
+    };
+  });
   return /*#__PURE__*/React.createElement(PisellStatisticList, _extends({}, others, {
     data: data,
     backgroundColors: backgroundColors,
     labelColor: labelColor,
     valueColor: valueColor
   }));
-};
+});
 export default BookingDashboard;

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

@@ -69,8 +69,8 @@ var EditBookingModal = function EditBookingModal(props, ref) {
   });
   var getInitData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-      var _data$toResource;
-      var mockProps, _data, _initResourceVal, toResourceFormId, _data$toResource2, _formatResources, list, maps, currentForm, relation_id, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _targetResource, _cloned, _idx;
+      var _data$fromResource, _data$toResource;
+      var mockProps, _data, _initResourceVal, fromResourceFormId, toResourceFormId, _form_id, _data$toResource2, _formatResources, list, maps, currentForm, relation_id, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _targetResource, _cloned, _idx, _sameResource;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -82,20 +82,25 @@ var EditBookingModal = function EditBookingModal(props, ref) {
             setData(_data);
 
             // 初始预期资源（日历放置点对应的资源）
-            _initResourceVal = _data.childrenBooking._extend.resource; // 目标资源所在 form_id
-            toResourceFormId = (_data$toResource = _data.toResource) === null || _data$toResource === void 0 ? void 0 : _data$toResource.form_id; // 若 1. 起止资源不同 且2. 能通过目标资源id找到所在资源组
+            _initResourceVal = _data.childrenBooking._extend.resource; // 源资源所在 from_id
+            fromResourceFormId = (_data$fromResource = _data.fromResource) === null || _data$fromResource === void 0 ? void 0 : _data$fromResource.form_id; // 目标资源所在 form_id
+            toResourceFormId = (_data$toResource = _data.toResource) === null || _data$toResource === void 0 ? void 0 : _data$toResource.form_id; // 若 1. 无资源移入具体资源
+            // 或 2. 具体资源移入无资源
+            // 则其中有一个 form_id 为 0，那么选择不为 0 的那个
+            _form_id = toResourceFormId || fromResourceFormId; // 若 1. 起止资源不同(必有一个不为 ‘no resource’)
+            // 且 2. 能通过目标资源id找到所在资源组
             // 则查找放置点所对应资源信息
-            if (params.fromResourceId !== params.toResourceId && toResourceFormId) {
+            if (params.fromResourceId !== params.toResourceId && !!_form_id) {
               _formatResources = formatResources({
                 cacheItem: _data.childrenBooking,
                 resourcesOrigin: _data.resourcesOrigin
               }), list = _formatResources.list, maps = _formatResources.maps;
-              currentForm = maps[toResourceFormId];
+              currentForm = maps[_form_id];
               relation_id = (_data$toResource2 = _data.toResource) === null || _data$toResource2 === void 0 ? void 0 : _data$toResource2.id;
-              if (currentForm && relation_id) {
+              if (currentForm && (relation_id || relation_id === 0)) {
                 _targetResource = {
                   relation_type: ((_currentForm$renderLi = currentForm.renderListMaps[relation_id]) === null || _currentForm$renderLi === void 0 || (_currentForm$renderLi = _currentForm$renderLi.usable) === null || _currentForm$renderLi === void 0 ? void 0 : _currentForm$renderLi.relation_type) || 'form',
-                  form_id: toResourceFormId,
+                  form_id: _form_id,
                   relation_id: relation_id,
                   like_status: 'common',
                   children: (_currentForm$renderLi2 = currentForm.renderListMaps) === null || _currentForm$renderLi2 === void 0 || (_currentForm$renderLi2 = _currentForm$renderLi2[relation_id]) === null || _currentForm$renderLi2 === void 0 ? void 0 : _currentForm$renderLi2.children,
@@ -104,20 +109,31 @@ var EditBookingModal = function EditBookingModal(props, ref) {
                     resource_name: (_currentForm$renderLi4 = currentForm.renderListMaps[relation_id]) === null || _currentForm$renderLi4 === void 0 ? void 0 : _currentForm$renderLi4.main_field
                   })
                 }; // 同一类型关联多个资源
-                if (Array.isArray(_initResourceVal[toResourceFormId])) {
-                  _cloned = _toConsumableArray(_initResourceVal[toResourceFormId]);
+                if (Array.isArray(_initResourceVal[_form_id])) {
+                  _cloned = _toConsumableArray(_initResourceVal[_form_id]);
                   _idx = _cloned.findIndex(function (rs) {
-                    return rs.relation_id == params.fromResourceId;
+                    var _rs$children;
+                    return rs.relation_id == params.fromResourceId || ((_rs$children = rs.children) === null || _rs$children === void 0 ? void 0 : _rs$children.find(function (child) {
+                      return child.relation_id == params.fromResourceId;
+                    }));
                   });
                   if (_idx !== -1) {
-                    _cloned[_idx] = _targetResource; // 替换现有对象
+                    // 去重: 同一资源类型下，设置了该类型的某个资源 A，以及无资源，当从无资源拖放至 A 上时需要去重
+                    _sameResource = _cloned.find(function (_clonedItem) {
+                      return _clonedItem.relation_id === (_targetResource === null || _targetResource === void 0 ? void 0 : _targetResource.relation_id);
+                    });
+                    if (_sameResource) {
+                      _cloned.splice(_idx, 1);
+                    } else {
+                      _cloned[_idx] = _targetResource; // 替换现有对象
+                    }
                   } else {
                     _cloned.push(_targetResource); // 添加新对象
                   }
-                  _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, toResourceFormId, _cloned));
+                  _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, _form_id, _cloned));
                 } else {
                   // 单选
-                  _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, toResourceFormId, [_targetResource]));
+                  _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, _form_id, [_targetResource]));
                 }
               }
             }
@@ -128,7 +144,7 @@ var EditBookingModal = function EditBookingModal(props, ref) {
                 toDate: [dayjs(mockProps.toStartDate), dayjs(mockProps.toEndDate)]
               });
             }, 100);
-          case 9:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -218,12 +234,11 @@ var EditBookingModal = function EditBookingModal(props, ref) {
   };
   var onOk = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var values, _data$childrenBooking, _extend, order_id, start_date, start_time, end_date, end_time;
+      var values, _data$childrenBooking, _extend, order_id, start_date, start_time, end_date, end_time, id, relation_id, like_status, relation_type, is_all, schedule_id, sub_type, select_date, number, metadata;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            values = form.getFieldsValue(); // console.log('values', values, data, cacheItem);
-            // return;
+            values = form.getFieldsValue();
             setUpdating(true);
             _context2.prev = 2;
             _data$childrenBooking = data.childrenBooking, _extend = _data$childrenBooking._extend, order_id = _data$childrenBooking.order_id;
@@ -231,8 +246,20 @@ var EditBookingModal = function EditBookingModal(props, ref) {
             start_time = values.toDate[0].format('HH:mm');
             end_date = values.toDate[1].format('YYYY-MM-DD');
             end_time = values.toDate[1].format('HH:mm');
-            _context2.next = 10;
-            return updateChildBooking(order_id, _objectSpread(_objectSpread({}, _extend), {}, {
+            console.log('extend data', _extend);
+            id = _extend.id, relation_id = _extend.relation_id, like_status = _extend.like_status, relation_type = _extend.relation_type, is_all = _extend.is_all, schedule_id = _extend.schedule_id, sub_type = _extend.sub_type, select_date = _extend.select_date, number = _extend.number, metadata = _extend.metadata;
+            _context2.next = 12;
+            return updateChildBooking(order_id, {
+              id: id,
+              relation_id: relation_id,
+              like_status: like_status,
+              relation_type: relation_type,
+              is_all: is_all,
+              schedule_id: schedule_id,
+              sub_type: sub_type,
+              select_date: select_date,
+              number: number,
+              metadata: metadata,
               resources: Object.values(values.resource).reduce(function (pre, cur) {
                 var newList = checkResourcesFormat(cur, cacheItem);
                 pre = pre.concat(newList);
@@ -243,23 +270,24 @@ var EditBookingModal = function EditBookingModal(props, ref) {
               end_date: end_date,
               end_time: end_time,
               duration: values.toDate[1].diff(values.toDate[0], 'minutes')
-            }));
-          case 10:
-            setOpen(false);
+            });
+          case 12:
+            // 清空，防止下次打开时看到残留数据
+            initState();
             props === null || props === void 0 || props.onOk();
-            _context2.next = 17;
+            _context2.next = 19;
             break;
-          case 14:
-            _context2.prev = 14;
+          case 16:
+            _context2.prev = 16;
             _context2.t0 = _context2["catch"](2);
             console.error(_context2.t0);
-          case 17:
+          case 19:
             setUpdating(false);
-          case 18:
+          case 20:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[2, 14]]);
+      }, _callee2, null, [[2, 16]]);
     }));
     return function onOk() {
       return _ref2.apply(this, arguments);
@@ -377,6 +405,7 @@ var EditBookingModal = function EditBookingModal(props, ref) {
     onClick: onOk,
     block: true,
     size: "large",
+    disabled: !data,
     loading: updating,
     style: {
       borderRadius: 20

package/es/components/booking/editBookingModal/serve.d.ts

@@ -46,6 +46,7 @@ export declare const init: (params: EditBookingModalParams) => Promise<{
         start_date: any;
     };
     resourcesOrigin: any[];
+    fromResource: any;
     toResource: any;
 }>;
 export declare const createCacheItem: (cacheItem: any, values?: any) => any;