@pisell/private-materials 3.0.162 → 3.0.164

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

@@ -1,12 +1,13 @@
-import React, { useMemo } from "react";
+import React, { useMemo } from 'react';
 import Like from "../like";
 import { getServiceTime } from "../../../utils";
-import { formatAmount, locales } from "@pisell/utils";
+import { formatAmount, locales } from '@pisell/utils';
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
-import { Alert } from "antd";
+import { Alert, Button } from 'antd';
 import Actions from "../actions";
 import "./index.less";
+import { Iconfont } from '@pisell/materials';
 var ServiceItem = function ServiceItem(_ref) {
   var _d$_extend3, _d$_extend4, _d$_extend5, _d$_extend5$other, _d$_extend6, _d$_extend6$other, _d$_extend7, _d$_extend8, _d$_extend9, _d$_extend$relation_d;
   var d = _ref.d,
@@ -14,7 +15,9 @@ var ServiceItem = function ServiceItem(_ref) {
     state = _ref.state,
     handleLike = _ref.handleLike,
     resourceItem = _ref.resourceItem,
-    errorMessage = _ref.errorMessage;
+    errorMessage = _ref.errorMessage,
+    handleDeleteService = _ref.handleDeleteService;
+  console.log(d, 'dddddd');
   var resourceName = (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.labelText) || d.relation_form_name;
   var isDiscount = useMemo(function () {
     var _d$_extend, _d$_extend2;
@@ -26,9 +29,20 @@ var ServiceItem = function ServiceItem(_ref) {
     onClick: function onClick() {
       handleEditService(d);
     }
-  }, d.id ? /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-service-item-delete",
+    onClick: function onClick(e) {
+      e.stopPropagation();
+      handleDeleteService(d);
+    }
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "text",
+    icon: /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-trash-01"
+    })
+  })), d.id ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-title"
-  }, d.title) : null, d._extend ? /*#__PURE__*/React.createElement(React.Fragment, null, state.renderType !== "eventBooking" && /*#__PURE__*/React.createElement("div", {
+  }, d.title) : null, d._extend ? /*#__PURE__*/React.createElement(React.Fragment, null, state.renderType !== 'eventBooking' && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-date"
   }, getServiceTime(d, state.date.value)), /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-technician"
@@ -54,11 +68,11 @@ var ServiceItem = function ServiceItem(_ref) {
     className: "pisell-lowcode__booking-service-item-original-price"
   }, formatAmount(d._extend.origin_total, 2, state.amountSymbol)) : null)) : null, isDiscount && (_d$_extend8 = d._extend) !== null && _d$_extend8 !== void 0 && _d$_extend8.discount_reason ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-discount-reason"
-  }, /*#__PURE__*/React.createElement("span", null, locales.getText("pisell2.text.discount-reason"), ":"), " ", (_d$_extend9 = d._extend) === null || _d$_extend9 === void 0 ? void 0 : _d$_extend9.discount_reason) : null, (_d$_extend$relation_d = d._extend.relation_details) !== null && _d$_extend$relation_d !== void 0 && _d$_extend$relation_d.length ? /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.text.discount-reason'), ":"), ' ', (_d$_extend9 = d._extend) === null || _d$_extend9 === void 0 ? void 0 : _d$_extend9.discount_reason) : null, (_d$_extend$relation_d = d._extend.relation_details) !== null && _d$_extend$relation_d !== void 0 && _d$_extend$relation_d.length ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-relation-details"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-title"
-  }, locales.getText("page.booking.text.sales")), d._extend.relation_details.map(function (item, index) {
+  }, locales.getText('page.booking.text.sales')), d._extend.relation_details.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-service-item-relation-detail",
       key: item.id

package/es/components/booking/info/service/serviceItem/index.less

@@ -94,6 +94,14 @@
     margin: 0 -20px -16px;
     border-radius: 0 0 8px 8px;
   }
+
+  .pisell-lowcode__booking-service-item-delete {
+    position: absolute;
+    padding: 10px;
+    top: 0;
+    right: 0;
+    cursor: pointer;
+  }
 }
 
 .pisell-lowcode__booking-service-item-relation-details {

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

@@ -45,6 +45,24 @@ var ServiceList = function ServiceList(_ref) {
       new: 0
     }));
   };
+  var handleDeleteService = function handleDeleteService(item) {
+    if (state.disabledEdit || state.disableEventBookingEdit || state.channelDisabledEdit) {
+      return;
+    }
+    var _list = _toConsumableArray(state.service.value);
+    _list = _list.filter(function (d) {
+      return d._id !== item._id;
+    });
+    dispatch({
+      type: 'setService',
+      payload: {
+        editModal: false,
+        value: _list,
+        edit: true,
+        cacheItem: null
+      }
+    });
+  };
   var getResourceItem = useCallback(function (id) {
     if (id === 0) {
       return getNoResource();
@@ -103,7 +121,8 @@ var ServiceList = function ServiceList(_ref) {
       d: d,
       handleEditService: handleEditService,
       state: state,
-      handleLike: handleLike
+      handleLike: handleLike,
+      handleDeleteService: handleDeleteService
     });
   }));
 };

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

@@ -28,6 +28,8 @@ import useEngineContext from "../../../hooks/useEngineContext";
 import Notes from "../info/notes";
 import "../info/index.less";
 import { Skeleton } from "antd";
+import classNames from "classnames";
+import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -37,7 +39,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state2$booking, _modal$state2$booking2, _modal$state2$booking3, _modal$state4, _modal$state4$notes, _modal$state6, _modal$state6$date, _modal$state6$date$va, _context$appHelper4, _context$appHelper4$u, _modal$state7, _React$createElement;
+  var _modal$state2, _modal$state2$booking, _modal$state2$booking2, _modal$state2$booking3, _modal$state4, _modal$state4$notes, _modal$state6, _modal$state6$date, _modal$state6$date$va, _context$appHelper4, _context$appHelper4$u, _classNames, _modal$state7, _React$createElement;
   // return <Payments {...props} />;
   var style = props.style,
     globalState = props.globalState,
@@ -51,6 +53,10 @@ var Info = Provider(function (props) {
     var _modal$state, _modal$state$bookingC, _modal$state$bookingC2, _modal$state$bookingC3;
     return ((_modal$state = modal.state) === null || _modal$state === void 0 ? void 0 : (_modal$state$bookingC = _modal$state.bookingConfig) === null || _modal$state$bookingC === void 0 ? void 0 : (_modal$state$bookingC2 = _modal$state$bookingC.config) === null || _modal$state$bookingC2 === void 0 ? void 0 : (_modal$state$bookingC3 = _modal$state$bookingC2.basic) === null || _modal$state$bookingC3 === void 0 ? void 0 : _modal$state$bookingC3.appointment_subject) || {};
   }, [(_modal$state2 = modal.state) === null || _modal$state2 === void 0 ? void 0 : (_modal$state2$booking = _modal$state2.bookingConfig) === null || _modal$state2$booking === void 0 ? void 0 : (_modal$state2$booking2 = _modal$state2$booking.config) === null || _modal$state2$booking2 === void 0 ? void 0 : (_modal$state2$booking3 = _modal$state2$booking2.basic) === null || _modal$state2$booking3 === void 0 ? void 0 : _modal$state2$booking3.appointment_subject]);
+  var _useCreateBookingPage = useCreateBookingPageHeader(globalState),
+    createHeader = _useCreateBookingPage.createHeader,
+    isBookingCreatePage = _useCreateBookingPage.isBookingCreatePage,
+    isBookingCreatePageCreateMode = _useCreateBookingPage.isBookingCreatePageCreateMode;
   useEffect(function () {
     document.body.id = 'body';
     // 注入函数到页面的state内
@@ -210,9 +216,9 @@ var Info = Provider(function (props) {
     })
   }, _defineProperty(_React$createElement, "style", {
     height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4$u = _context$appHelper4.utils) !== null && _context$appHelper4$u !== void 0 && _context$appHelper4$u.isMobile ? '100%' : '100vh'
-  }), _defineProperty(_React$createElement, "bodyClassName", "booking-info-warp"), _React$createElement), /*#__PURE__*/React.createElement("div", {
+  }), _defineProperty(_React$createElement, "bodyClassName", classNames('booking-info-warp', (_classNames = {}, _defineProperty(_classNames, 'create-booking-page-info-wrap', isBookingCreatePage), _defineProperty(_classNames, 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode), _classNames))), _React$createElement), /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,6 +1,12 @@
 import React from 'react';
+import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
-declare const Info: ({ onEdit }: {
+interface AddServiceProps {
     onEdit: any;
-}) => React.JSX.Element;
+    dispatch?: any;
+    state?: any;
+    drawerProps?: PisellDrawerProps;
+    renderMode?: 'current' | 'drawer';
+}
+declare const Info: (props: AddServiceProps) => React.JSX.Element;
 export default Info;

package/es/components/booking/info2/service/addService/index.js

@@ -1,4 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+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 _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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -33,9 +34,11 @@ import { formatProductListByCategory, getProductTotalPrice, request } from "../.
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
-var Info = function Info(_ref) {
+var Info = function Info(props) {
   var _state$service2, _state$service4, _state$service5, _state$service5$cache;
-  var onEdit = _ref.onEdit;
+  var onEdit = props.onEdit,
+    drawerProps = props.drawerProps,
+    renderMode = props.renderMode;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     search = _useState2[0],
@@ -49,6 +52,8 @@ var Info = function Info(_ref) {
     setLoading = _useState4[1];
   var searchRef = useRef();
   var context = useEngineContext();
+  state = state || (props === null || props === void 0 ? void 0 : props.state);
+  dispatch = dispatch || (props === null || props === void 0 ? void 0 : props.dispatch);
   request.setRequest(context.appHelper.utils.request);
 
   /**
@@ -60,7 +65,7 @@ var Info = function Info(_ref) {
    * @Date: 2024-05-14 13:55
    */
   var setDefaultService = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(list) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(list) {
       var _list, product, detail, isBundleOrCombination, _item;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -140,11 +145,11 @@ var Info = function Info(_ref) {
       }, _callee);
     }));
     return function setDefaultService(_x2) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
   var getServices = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
       var _state$eventOtherPara;
       var data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -152,7 +157,7 @@ var Info = function Info(_ref) {
           case 0:
             setLoading(true);
             _context2.next = 3;
-            return state.apis.getServices({
+            return state.apis.getServices(_objectSpread({
               skip: 1,
               num: 500,
               extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'service_product'],
@@ -162,11 +167,14 @@ var Info = function Info(_ref) {
               with_schedule: 1,
               with_count: ['bundleGroup', 'optionGroup'],
               order_by_string: 'sort:desc',
-              status: 'published',
+              status: 'published'
+            }, state.isBookingCreatePage ? {
+              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date
+            } : {
               _config: {
                 useCache: true
               }
-            });
+            }));
           case 3:
             data = _context2.sent;
             setLoading(false);
@@ -187,8 +195,8 @@ var Info = function Info(_ref) {
         }
       }, _callee2);
     }));
-    return function getServices() {
-      return _ref3.apply(this, arguments);
+    return function getServices(_x3) {
+      return _ref2.apply(this, arguments);
     };
   }();
   var handleSelectService = function handleSelectService() {
@@ -257,6 +265,11 @@ var Info = function Info(_ref) {
           cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
           cacheItem.new = 0;
         }
+        // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
+        if (renderMode === 'current') {
+          // cacheItem._extend.resource = 0;
+          cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
+        }
         cacheItem = getProductExtend({
           cacheItem: cacheItem,
           state: state
@@ -328,12 +341,29 @@ var Info = function Info(_ref) {
       setSearch('');
     }
   }, [state.service.addModal]);
+  var currentDate = useMemo(function () {
+    return state.date.value.format('YYYY-MM-DD');
+  }, [state.date.value]);
+  useEffect(function () {
+    if (renderMode === 'current') {
+      getServices({
+        schedule_date: currentDate
+      });
+    }
+  }, [renderMode, currentDate]);
   useEffect(function () {
     if (state.renderType === 'eventBooking' && state.modalOpen) {
       getServices();
     }
   }, [state.renderType, state.modalOpen]);
   var addButton = useMemo(function () {
+    if (state.isBookingCreatePage) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          height: 20
+        }
+      });
+    }
     if (state.renderType === 'eventBooking') {
       return isService ? /*#__PURE__*/React.createElement("div", {
         style: {
@@ -358,12 +388,50 @@ var Info = function Info(_ref) {
       }
     });
   }, [state.renderType, showAddButton, isService, state.service.value, loading]);
+  var isRenderCurrent = useMemo(function () {
+    return renderMode === 'current';
+  }, [renderMode]);
+  var header = /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-service-header"
+  }, /*#__PURE__*/React.createElement(Input, {
+    ref: searchRef,
+    prefix: /*#__PURE__*/React.createElement(SearchLg, null),
+    style: {
+      marginTop: 16,
+      height: 44
+    },
+    placeholder: locales.getText('pisell2.text.search'),
+    allowClear: true,
+    value: search,
+    onChange: function onChange(e) {
+      setSearch(e.target.value);
+    }
+  }));
+  var content = /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-service-body"
+  }, /*#__PURE__*/React.createElement(TabProduct, {
+    list: renderList,
+    amountSymbol: state.amountSymbol,
+    onChange: handleSelectProduct,
+    scrollDom: isRenderCurrent ? '.pisell-lowcode__booking-vertical-add-service-wrap' : '.booking-server-wrap .pisell-lowcode-drawer-body '
+  }));
+  if (isRenderCurrent) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "pisell-lowcode__booking-vertical-add-service-wrap",
+      style: {
+        width: '100%',
+        height: '100%',
+        overflow: 'auto'
+      }
+    }, header, content);
+  }
   return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : (_state$service5$cache = _state$service5.cacheItem) === null || _state$service5$cache === void 0 ? void 0 : _state$service5$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
     loading: true,
     active: true,
     round: true
-  }), addButton, /*#__PURE__*/React.createElement(Drawer, {
-    open: state.service.addModal,
+  }), addButton, /*#__PURE__*/React.createElement(Drawer, _extends({
+    titleNoWrap: true,
+    open: state.service.addModal && !state.isBookingCreatePage,
     title: locales.getText('pisell2.text.select-service'),
     rootClassName: "booking-server-wrap",
     onClose: function onClose() {
@@ -375,29 +443,7 @@ var Info = function Info(_ref) {
         }
       });
     },
-    header: /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-service-header"
-    }, /*#__PURE__*/React.createElement(Input, {
-      ref: searchRef,
-      prefix: /*#__PURE__*/React.createElement(SearchLg, null),
-      style: {
-        marginTop: 16,
-        height: 44
-      },
-      placeholder: locales.getText('pisell2.text.search'),
-      allowClear: true,
-      value: search,
-      onChange: function onChange(e) {
-        setSearch(e.target.value);
-      }
-    }))
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode__booking-service-body"
-  }, /*#__PURE__*/React.createElement(TabProduct, {
-    list: renderList,
-    amountSymbol: state.amountSymbol,
-    onChange: handleSelectProduct,
-    scrollDom: ".booking-server-wrap .pisell-lowcode-drawer-body"
-  }))));
+    header: header
+  }, drawerProps || {}), content));
 };
 export default Info;

package/es/components/booking/info2/service/addTimeModal/index.js

@@ -574,6 +574,7 @@ var AddTimeModal = function AddTimeModal() {
     return "".concat(locales.getText('page.booking.text.update-time'), ": ").concat(startTime, " ~ ").concat(endTime, " (").concat(hours, ")");
   }, [newService, state.locale]);
   return /*#__PURE__*/React.createElement(Drawer, {
+    titleNoWrap: true,
     open: state.service.addTimeModal,
     title: locales.getText('page.booking.text.add-time'),
     rootClassName: "booking-server-wrap",

package/es/components/booking/info2/service/editService/index.js

@@ -336,6 +336,12 @@ var Info = function Info(_, ref) {
       getResources();
     }
   }, [useStartTime, useDuration, state.renderType, state.service.resourcesOrigin]);
+  useEffect(function () {
+    // 预约创建页面并且打开了编辑弹窗
+    if (state.isBookingCreatePage && state.service.editModal) {
+      setEditData(null);
+    }
+  }, [state.service.editModal, state.isBookingCreatePage]);
 
   /**
    * @title: 价格发生变化,重新计算折扣
@@ -458,9 +464,10 @@ var Info = function Info(_, ref) {
   });
   console.log('state.service.value', state.service.value);
   var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer
-  //通过zIndex的方式控制  添加商品 和 编辑服务弹窗的上下层级
-  , {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
+    titleNoWrap: true
+    //通过zIndex的方式控制  添加商品 和 编辑服务弹窗的上下层级
+    ,
     zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
     open: state.service.editModal && !((_state$service$cacheI9 = state.service.cacheItem) !== null && _state$service$cacheI9 !== void 0 && _state$service$cacheI9.autoClose),
@@ -498,7 +505,7 @@ var Info = function Info(_, ref) {
     className: "current-service-info-name"
   }, ((_state$service8 = state.service) === null || _state$service8 === void 0 ? void 0 : (_state$service8$cache = _state$service8.cacheItem) === null || _state$service8$cache === void 0 ? void 0 : (_state$service8$cache2 = _state$service8$cache._extend) === null || _state$service8$cache2 === void 0 ? void 0 : _state$service8$cache2.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
     onClick: handleEdit
-  }, locales.getText('pisell2.text.edit')), /*#__PURE__*/React.createElement(Button, {
+  }, locales.getText('pisell2.text.edit')), !state.isBookingCreatePage && /*#__PURE__*/React.createElement(Button, {
     onClick: handleChange
   }, locales.getText('pisell2.text.change'))), /*#__PURE__*/React.createElement(CollapsibleList, {
     style: {

package/es/components/booking/info2/service/index.js

@@ -5,10 +5,12 @@ import EditService from "./editService";
 import "../../info/service/index.less";
 import ServiceList from "./serviceList";
 import AddTimeModal from "./addTimeModal";
+import useClearCart from "../../hooks/useClearCart";
 var Service = function Service() {
   var _state$bookingConfig2, _state$bookingConfig3;
   var _useContext = useContext(Context),
-    state = _useContext.state;
+    state = _useContext.state,
+    dispatch = _useContext.dispatch;
   var detailRef = useRef();
   useEffect(function () {
     document.body.id = 'body';
@@ -42,9 +44,10 @@ var Service = function Service() {
       (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 ? void 0 : (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 ? void 0 : _detailRef$current$in.call(_detailRef$current, cacheItem);
     }, 100);
   };
+  var clearCart = useClearCart(state, dispatch);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-wrap"
-  }, /*#__PURE__*/React.createElement(ServiceList, {
+  }, clearCart, /*#__PURE__*/React.createElement(ServiceList, {
     onEdit: handleEdit
   }), /*#__PURE__*/React.createElement(AddService, {
     onEdit: handleEdit

package/es/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, }: any) => React.JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;

package/es/components/booking/info2/service/serviceItem/index.js

@@ -4,9 +4,10 @@ import { getServiceTime } from "../../../utils";
 import { formatAmount, locales } from '@pisell/utils';
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
-import { Alert } from 'antd';
+import { Alert, Button } from 'antd';
 import Actions from "../actions";
 import "./index.less";
+import { Iconfont } from "@pisell/materials";
 var getName = function getName(name, locale) {
   return name[locale] || name['original'] || name['en'] || '';
 };
@@ -42,7 +43,8 @@ var ServiceItem = function ServiceItem(_ref) {
     handleEditService = _ref.handleEditService,
     state = _ref.state,
     handleLike = _ref.handleLike,
-    errorMessage = _ref.errorMessage;
+    errorMessage = _ref.errorMessage,
+    handleDeleteService = _ref.handleDeleteService;
   var isDiscount = useMemo(function () {
     var _d$_extend, _d$_extend2;
     return Number((_d$_extend = d._extend) === null || _d$_extend === void 0 ? void 0 : _d$_extend.total) != Number((_d$_extend2 = d._extend) === null || _d$_extend2 === void 0 ? void 0 : _d$_extend2.origin_total);
@@ -127,7 +129,18 @@ var ServiceItem = function ServiceItem(_ref) {
     onClick: function onClick() {
       handleEditService(d);
     }
-  }, d.id ? /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-service-item-delete",
+    onClick: function onClick(e) {
+      e.stopPropagation();
+      handleDeleteService(d);
+    }
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "text",
+    icon: /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-trash-01"
+    })
+  })), d.id ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-title"
   }, d.title) : null, d._extend && state.renderType !== 'eventBooking' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-date"

package/es/components/booking/info2/service/serviceList/index.js

@@ -45,6 +45,24 @@ var ServiceList = function ServiceList(_ref) {
     });
     onEdit === null || onEdit === void 0 ? void 0 : onEdit(cacheItem);
   };
+  var handleDeleteService = function handleDeleteService(item) {
+    if (state.disabledEdit || state.disableEventBookingEdit || state.channelDisabledEdit) {
+      return;
+    }
+    var _list = _toConsumableArray(state.service.value);
+    _list = _list.filter(function (d) {
+      return d._id !== item._id;
+    });
+    dispatch({
+      type: 'setService',
+      payload: {
+        editModal: false,
+        value: _list,
+        edit: true,
+        cacheItem: null
+      }
+    });
+  };
   var getErrorMessage = useCallback(function (service) {
     var _errorList;
     var errorList = [];
@@ -99,7 +117,8 @@ var ServiceList = function ServiceList(_ref) {
       d: d,
       handleEditService: handleEditService,
       state: state,
-      handleLike: handleLike
+      handleLike: handleLike,
+      handleDeleteService: handleDeleteService
     });
   }));
 };

package/es/components/booking/info2/utilsByBooking.js

@@ -324,8 +324,12 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     if (findNextSliceProps.date && findNextSliceProps.date !== '00:00') {
       _extend.start_time = findNextSliceProps.date;
     } else {
-      // 没有预设日期, 则使用当前 https://www.yuque.com/feg4xm/manual/tzvrnt05ifihkndg
-      _extend.start_time = dayjs().format('HH:mm');
+      if (cacheItem.currentDefaultTime) {
+        _extend.start_time = cacheItem.currentDefaultTime;
+      } else {
+        // 没有预设日期, 则使用当前 https://www.yuque.com/feg4xm/manual/tzvrnt05ifihkndg
+        _extend.start_time = dayjs().format('HH:mm');
+      }
     }
   }
   _extend = _objectSpread(_objectSpread({}, _extend), cacheItem._extend);