@pisell/private-materials 3.0.12 → 3.0.14

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

@@ -48,8 +48,6 @@ var TabProduct = function TabProduct(props) {
           name = _entries$0$target$id$2[0],
           id = _entries$0$target$id$2[1];
         setCurrent(Number(id));
-        var dom = document.querySelector("#pisell-tabs-content");
-        console.log("tabsRef?.current?.scroll(id)", tabsRef === null || tabsRef === void 0 ? void 0 : tabsRef.current, id);
         tabsRef === null || tabsRef === void 0 ? void 0 : (_tabsRef$current = tabsRef.current) === null || _tabsRef$current === void 0 ? void 0 : _tabsRef$current.scroll(id);
       }
     }, {
@@ -105,14 +103,14 @@ var TabProduct = function TabProduct(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(productDetail);
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "tab-product"
+    className: "booking-tab-product"
   }, /*#__PURE__*/React.createElement("div", {
-    className: "tabs-wrap",
+    className: "booking-tabs-wrap",
     style: {
       top: "100px"
     }
   }, /*#__PURE__*/React.createElement(Card, {
-    className: "tabs",
+    className: "booking-tabs",
     id: "product-category"
   }, /*#__PURE__*/React.createElement(Tabs, {
     ref: tabsRef,
@@ -138,18 +136,18 @@ var TabProduct = function TabProduct(props) {
       }, 1000);
     }
   }))), /*#__PURE__*/React.createElement("div", {
-    className: "category-list"
+    className: "booking-category-list"
   }, list.map(function (d, i) {
     return /*#__PURE__*/React.createElement("div", {
-      className: "category-item",
+      className: "booking-category-item",
       id: "list-".concat(d.id),
       key: i
     }, /*#__PURE__*/React.createElement("div", {
-      className: "category-title"
+      className: "booking-category-title"
     }, d.name), /*#__PURE__*/React.createElement("div", {
-      className: "product-list"
+      className: "booking-product-list"
     }, /*#__PURE__*/React.createElement(Card, {
-      className: "card",
+      className: "booking-card",
       layout: 2
     }, d.products.map(function (item) {
       return /*#__PURE__*/React.createElement(ProductItem, {

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

@@ -1,4 +1,4 @@
-.tab-product {
+.booking-tab-product {
   position: relative;
   width: 100%;
   display: flex;
@@ -7,14 +7,14 @@
   scroll-behavior: smooth;
   border-radius: 12px;
 
-  .tabs-wrap {
+  .booking-tabs-wrap {
     position: sticky;
     // top: 157px;
     z-index: 58;
     width: 100%;
   }
 
-  .tabs {
+  .booking-tabs {
     display: flex;
     align-items: center;
     justify-content: center;
@@ -25,13 +25,13 @@
     margin-bottom: 0;
   }
 
-  .category-list {
+  .booking-category-list {
     width: 100%;
     height: 100%;
     padding: 0 32px;
 
-    .category-item {
-      .category-title {
+    .booking-category-item {
+      .booking-category-title {
         margin: 16px 0;
         font-style: normal;
         font-weight: 600;
@@ -40,8 +40,8 @@
         color: #1b1b1b;
       }
 
-      .product-list {
-        .card {
+      .booking-product-list {
+        .booking-card {
           padding: 0;
           margin-bottom: 16px;
 

package/es/components/booking/components/TabProduct/tabs/index.js

@@ -127,6 +127,7 @@ var Tabs = function Tabs(_ref, ref) {
   // 设置滚动位置
   var setTabScroll = function setTabScroll(val) {
     var dom = document.querySelector("#pisell-tabs-content");
+    console.log("domdom", dom);
     if (!dom) {
       return;
     }
@@ -156,7 +157,7 @@ var Tabs = function Tabs(_ref, ref) {
   // 左侧按钮
   var leftBtn = useMemo(function () {
     return /*#__PURE__*/React.createElement("div", {
-      className: "pisell-tabs-btn-left",
+      className: "booking-pisell-tabs-btn-left",
       style: {
         width: leftWidth,
         marginLeft: !leftWidth ? "20px" : 0
@@ -165,14 +166,14 @@ var Tabs = function Tabs(_ref, ref) {
         onPageChange("left");
       }
     }, /*#__PURE__*/React.createElement(ChevronRight, {
-      className: "pisell-tabs-btn-icon"
+      className: "booking-pisell-tabs-btn-icon"
     }));
   }, [leftWidth]);
 
   // 右侧按钮
   var rightBtn = useMemo(function () {
     return /*#__PURE__*/React.createElement("div", {
-      className: "pisell-tabs-btn-right",
+      className: "booking-pisell-tabs-btn-right",
       style: {
         width: rightWidth,
         marginRight: !rightWidth ? "20px" : 0
@@ -182,21 +183,21 @@ var Tabs = function Tabs(_ref, ref) {
       }
     }, /*#__PURE__*/React.createElement(ChevronLeft, {
       type: "icona-iconArrowsLine",
-      className: "pisell-tabs-btn-icon"
+      className: "booking-pisell-tabs-btn-icon"
     }));
   }, [rightWidth]);
 
   // 中间内容
   var content = useMemo(function () {
     return /*#__PURE__*/React.createElement("div", {
-      className: "pisell-tabs-content",
+      className: "booking-pisell-tabs-content",
       id: "pisell-tabs-content",
       onScroll: onScroll
     }, _options.map(function (d, i) {
       var _key = rowKey ? d[rowKey] : i;
       return /*#__PURE__*/React.createElement("div", {
-        className: classNames("pisell-tabs-tab", {
-          "pisell-tabs-tab-active": tab === _key
+        className: classNames("booking-pisell-tabs-tab", {
+          "booking-pisell-tabs-tab-active": tab === _key
         }),
         key: _key,
         id: name + "" + _key,
@@ -204,12 +205,12 @@ var Tabs = function Tabs(_ref, ref) {
           _onChange(_key, d, e);
         }
       }, renderTab ? renderTab(d) : /*#__PURE__*/React.createElement("div", {
-        className: "pisell-tabs-tab-content"
+        className: "booking-pisell-tabs-tab-content"
       }, d.name));
     }));
   }, [_options, rowKey, name, tab]);
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames("pisell-tabs", className),
+    className: classNames("booking-pisell-tabs", className),
     id: "pisell-tabs"
   }, isShowButton && leftBtn, content, isShowButton && rightBtn);
 };

package/es/components/booking/components/TabProduct/tabs/index.less

@@ -1,4 +1,4 @@
-.pisell-tabs {
+.booking-pisell-tabs {
   display: flex;
   -webkit-box-align: center;
   align-items: center;
@@ -9,8 +9,8 @@
   color: #0d1619;
   cursor: default;
 
-  .pisell-tabs-btn-left,
-  .pisell-tabs-btn-right {
+  .booking-pisell-tabs-btn-left,
+  .booking-pisell-tabs-btn-right {
     -webkit-box-flex: 0;
     flex-grow: 0;
     flex-shrink: 0;
@@ -29,7 +29,7 @@
     overflow: hidden;
     user-select: none;
 
-    .pisell-tabs-btn-icon {
+    .booking-pisell-tabs-btn-icon {
       width: 24px;
       height: 24px;
       background: #f1f1f1;
@@ -42,9 +42,11 @@
     }
   }
 
-  .pisell-tabs-btn-left {}
+  .booking-pisell-tabs-btn-left {
+    transform: rotate(180deg);
+  }
 
-  .pisell-tabs-btn-right {
+  .booking-pisell-tabs-btn-right {
     /* White */
 
     background: #ffffff;
@@ -52,12 +54,12 @@
 
     // box-shadow: 0px 6px 15px -3px rgba(0, 0, 0, 0.15);
 
-    .pisell-tabs-btn-icon {
+    .booking-pisell-tabs-btn-icon {
       transform: rotate(180deg);
     }
   }
 
-  .pisell-tabs-content {
+  .booking-pisell-tabs-content {
     width: 100%;
     max-width: none;
     overflow: scroll hidden;
@@ -80,13 +82,13 @@
       display: none;
     }
 
-    .pisell-tabs-tab {
+    .booking-pisell-tabs-tab {
       scroll-snap-align: start;
       white-space: initial;
       flex-shrink: 0;
       cursor: pointer;
 
-      .pisell-tabs-tab-content {
+      .booking-pisell-tabs-tab-content {
         display: inline-flex;
         height: 40px;
         padding: 0px 16px;
@@ -105,13 +107,13 @@
       }
 
       &:hover {
-        .pisell-tabs-tab-content {
+        .booking-pisell-tabs-tab-content {
           background-color: #f1f1f1;
         }
       }
 
-      &.pisell-tabs-tab-active {
-        .pisell-tabs-tab-content {
+      &.booking-pisell-tabs-tab-active {
+        .booking-pisell-tabs-tab-content {
           color: #fff;
           background: var(--primary-600, #7F56D9);
         }

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

@@ -7,14 +7,14 @@
  */
 import React from "react";
 import "./index.less";
-interface AddButtonProps {
-    onClick: () => void;
-    title: string;
-    subTitle: string;
-    showSub: boolean;
-    style: any;
-    disabled: boolean;
-    loading: any;
+export interface AddButtonProps {
+    onClick?: () => void;
+    title?: string;
+    subTitle?: string;
+    showSub?: boolean;
+    style?: React.CSSProperties;
+    disabled?: boolean;
+    loading?: boolean;
 }
 declare const AddButton: React.FC<AddButtonProps>;
 export default AddButton;

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

@@ -26,7 +26,7 @@ var AddButton = function AddButton(_ref) {
     if (disabled) {
       message.warning(locales.getText("pisell2.text.please-select-the-customer-first"));
     } else {
-      onClick();
+      onClick === null || onClick === void 0 ? void 0 : onClick();
     }
   };
 

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

@@ -402,7 +402,7 @@ var CustomSelect = function CustomSelect(props, ref) {
         className: "pisell-lowcode__custom-select-card-list-item-content"
       }, mode === "multiple" && /*#__PURE__*/React.createElement(Checkbox, {
         className: "custom-select-checkbox",
-        checked: getItemByArray(_value, item, "form_record_id")
+        checked: getItemByArray(_value, item, rowKey)
       }), optionRender(item)));
     }
   })));

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

@@ -1,8 +1,9 @@
 import React from "react";
 import { DrawerProps } from "antd";
 import "./index.less";
-interface PisellDrawerProps extends DrawerProps {
+export interface PisellDrawerProps extends DrawerProps {
     header?: React.ReactNode;
+    titleNoWrap?: boolean;
 }
 /**
  * @title: 自定义抽屉

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

@@ -3,6 +3,7 @@ import React from "react";
 import { Drawer as OriginDrawer } from "antd";
 import ArrowLeft from "@pisell/icon/es/ArrowLeft";
 import "./index.less";
+import classNames from "classnames";
 /**
  * @title: 自定义抽屉
  * @description:
@@ -24,7 +25,7 @@ var Drawer = function Drawer(props) {
     push: false,
     mask: false
   }), /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode__booking-drawer-title-wrap"
+    className: classNames("pisell-lowcode__booking-drawer-title-wrap")
   }, /*#__PURE__*/React.createElement(ArrowLeft, {
     className: "pisell-lowcode__booking-drawer-back",
     onClick: function onClick(e) {
@@ -32,7 +33,9 @@ var Drawer = function Drawer(props) {
       (_props$onClose = props.onClose) === null || _props$onClose === void 0 ? void 0 : _props$onClose.call(props, e);
     }
   }), /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode__booking-drawer-title"
+    className: classNames("pisell-lowcode__booking-drawer-title", {
+      "pisell-lowcode__booking-drawer-title-no-wrap": props.titleNoWrap
+    })
   }, props.title), props.header), /*#__PURE__*/React.createElement("div", null, props.children));
 };
 export default Drawer;

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

@@ -8,6 +8,8 @@
   z-index: 2;
   padding: 24px 32px 0 32px;
 
+
+
   .pisell-lowcode__booking-drawer-back {
     font-size: 32px;
     color: #000000;
@@ -30,4 +32,8 @@
   &::-webkit-scrollbar {
     display: block;
   }
+}
+
+.pisell-lowcode__booking-drawer-title-no-wrap {
+  display: inline;
 }

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

@@ -7,7 +7,7 @@ var FooterMenus = function FooterMenus(_ref) {
     dispatch = _ref.dispatch;
   var items = useMemo(function () {
     var list = [];
-    if (state.bookingId) {
+    if (state.bookingId && state.renderType !== 'eventBooking') {
       list.push({
         label: locales.getText("pisell2.text.rebook"),
         key: "rebook"

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

@@ -259,7 +259,7 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref4) {
-      var type, _setLoading, saveOtherValue, _state$onSave, callbackData, values, api;
+      var type, _setLoading, editApi, createApi, saveOtherValue, _state$onSave, callbackData, values, api;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -267,60 +267,62 @@ var Footer = function Footer(props) {
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === "checkout" ? setCheckoutLoading : setLoading;
             _setLoading(true);
+            editApi = state.renderType === 'eventBooking' ? state.apis.editEventBooking : state.apis.editBooking;
+            createApi = state.renderType === 'eventBooking' ? state.apis.createEventBooking : state.apis.createBooking;
             saveOtherValue = {};
             if (!(type === "save")) {
-              _context4.next = 11;
+              _context4.next = 13;
               break;
             }
-            _context4.next = 7;
+            _context4.next = 9;
             return state === null || state === void 0 ? void 0 : (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 7:
+          case 9:
             _context4.t0 = _context4.sent;
             if (_context4.t0) {
-              _context4.next = 10;
+              _context4.next = 12;
               break;
             }
             _context4.t0 = {};
-          case 10:
+          case 12:
             saveOtherValue = _context4.t0;
-          case 11:
-            _context4.prev = 11;
+          case 13:
+            _context4.prev = 13;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
-            api = state.bookingId ? state.apis.editBooking : state.apis.createBooking; // 如果有addons改动, 则先保存
+            api = state.bookingId ? editApi : createApi; // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context4.next = 18;
+              _context4.next = 20;
               break;
             }
-            _context4.next = 18;
+            _context4.next = 20;
             return handleSaveAddons();
-          case 18:
+          case 20:
             if (!infoEdit) {
-              _context4.next = 23;
+              _context4.next = 25;
               break;
             }
-            _context4.next = 21;
+            _context4.next = 23;
             return api(values);
-          case 21:
+          case 23:
             callbackData = _context4.sent;
             message.success(locales.getText(state.bookingId ? "pisell2.text.appointment-updated" : "pisell2.text.created-successfully"));
-          case 23:
+          case 25:
             // 回调关闭弹窗
             state === null || state === void 0 ? void 0 : state.callback(callbackData);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context4.abrupt("return", callbackData);
-          case 28:
-            _context4.prev = 28;
-            _context4.t1 = _context4["catch"](11);
+          case 30:
+            _context4.prev = 30;
+            _context4.t1 = _context4["catch"](13);
             console.log(_context4.t1);
             _setLoading(false);
-          case 32:
+          case 34:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[11, 28]]);
+      }, _callee4, null, [[13, 30]]);
     }));
     return function handleSave(_x3) {
       return _ref5.apply(this, arguments);

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

@@ -26,13 +26,14 @@ var formatCustomer = function formatCustomer(data) {
 };
 var formatBookings = function formatBookings(data) {
   var list = data.service.value;
+  var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   bookings = list.map(function (item) {
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var start_time = item._extend.startDate.format("HH:mm");
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format("HH:mm");
-    return {
+    return _objectSpread({
       "product": {
         "num": item._extend.quantity,
         "price": item.price,
@@ -60,7 +61,7 @@ var formatBookings = function formatBookings(data) {
       "start_date": start_date,
       "duration": flexibleObj.getValue(item._extend.duration),
       "number": item._extend.number || 1
-    };
+    }, eventOtherParams || {});
   });
   return bookings;
 };
@@ -86,7 +87,7 @@ var formatHolder = function formatHolder(data, values) {
 // https://menutech.w.eolink.com/home/api-studio/inside/K2bI3n465fe7244b3dbd6679d87caedfbb0636bf8c29eda/api/2778666/detail/53001549?spaceKey=menutech
 export var formatValues = function formatValues(state) {
   var values = {
-    type: "appointment_booking",
+    type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
     platform: "shop",
     sales_channel: "my_pisel",
     bookings: [],

package/es/components/booking/forms/forms.js

@@ -31,7 +31,8 @@ import "./index.less";
  */
 var Forms = Provider(function (props) {
   var forms = props.forms,
-    value = props.value,
+    _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
     modalOpen = props.modalOpen,
     onChange = props.onChange,
     action = props.action,

package/es/components/booking/info/client/index.js

@@ -141,7 +141,6 @@ var Info = function Info() {
     return item.name || (item.display_name || "").trim() || (item.nickname || "").trim() || "";
   }, [locales.localeMap]);
   var handleSelectClient = function handleSelectClient(value) {
-    console.log("valuevalue", value);
     var _value = (value === null || value === void 0 ? void 0 : value[value.length - 1]) || walkInData;
     if (_value.loading) {
       return;

package/es/components/booking/info/date/index.less

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-body-select-date {
-  padding: 24px 0;
+  padding: 24px 0 8px;
   font-weight: 550;
 
   .pisell-lowcode-picker-input>input {

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

@@ -73,12 +73,18 @@ var Info = Provider(function (props) {
       }
     });
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
-    style: style,
-    header: globalState !== null && globalState !== void 0 && globalState.bookingId ? /*#__PURE__*/React.createElement(Header, {
+  var header = useMemo(function () {
+    if ((globalState === null || globalState === void 0 ? void 0 : globalState.renderType) === 'eventBooking') {
+      return locales.getText("pisell2.text.enroll");
+    }
+    return globalState !== null && globalState !== void 0 && globalState.bookingId ? /*#__PURE__*/React.createElement(Header, {
       state: modal.state,
       dispatch: modal.dispatch
-    }) : locales.getText("pisell2.text.new-appointment"),
+    }) : locales.getText("pisell2.text.new-appointment");
+  }, [globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, modal.state, modal.dispatch, globalState === null || globalState === void 0 ? void 0 : globalState.renderType]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
+    style: style,
+    header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {
       state: modal.state,
       dispatch: modal.dispatch,

package/es/components/booking/info/pet/index.js

@@ -28,7 +28,7 @@ import FormsCom from "../../forms/forms";
 import { changeFormValues } from "../../forms/format";
 import { isWalkIn } from "../../utils";
 var Pet = function Pet() {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$pet, _state$client$value2, _state$client8, _state$client8$value, _state$client9;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$client$value2, _state$client8, _state$client8$value, _state$client9;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -136,7 +136,6 @@ var Pet = function Pet() {
       return _ref2.apply(this, arguments);
     };
   }();
-  console.log("values", (_state$pet = state.pet) === null || _state$pet === void 0 ? void 0 : _state$pet.value);
 
   /**
    * @title: 获取预约主体表单
@@ -167,7 +166,7 @@ var Pet = function Pet() {
             _context2.prev = 5;
             _context2.next = 8;
             return state.apis.getForms({
-              relation_type: "appointment_booking",
+              relation_type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
               relation_id: ((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : (_state$bookingDetail$ = _state$bookingDetail.bookings) === null || _state$bookingDetail$ === void 0 ? void 0 : _state$bookingDetail$.id) || 0
               // _config: { useCache: true },
             });
@@ -300,11 +299,11 @@ var Pet = function Pet() {
 
   // 当客户id 发生改变时, 检测当前表单是否是该客户的, 如果不是则移除
   useEffect(function () {
-    var _state$pet2, _state$client7, _state$client7$value, _state$pet3;
+    var _state$pet, _state$client7, _state$client7$value, _state$pet2;
     var changeFormValuesData = changeFormValues({
-      values: ((_state$pet2 = state.pet) === null || _state$pet2 === void 0 ? void 0 : _state$pet2.value) || {},
+      values: ((_state$pet = state.pet) === null || _state$pet === void 0 ? void 0 : _state$pet.value) || {},
       clientId: (_state$client7 = state.client) === null || _state$client7 === void 0 ? void 0 : (_state$client7$value = _state$client7.value) === null || _state$client7$value === void 0 ? void 0 : _state$client7$value.id,
-      forms: ((_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.formData) || []
+      forms: ((_state$pet2 = state.pet) === null || _state$pet2 === void 0 ? void 0 : _state$pet2.formData) || []
     });
     dispatch({
       type: "setPet",
@@ -326,7 +325,6 @@ var Pet = function Pet() {
       getForms(true);
     }
   }, [state.bookingId, state.bookingDetail, params.form_id, params.type, (_state$client8 = state.client) === null || _state$client8 === void 0 ? void 0 : (_state$client8$value = _state$client8.value) === null || _state$client8$value === void 0 ? void 0 : _state$client8$value.id]);
-  console.log("state.pet.formData", state.pet.formData);
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-pet-wraps"
   }, /*#__PURE__*/React.createElement(FormsCom, {