@pisell/private-materials 3.0.46 → 3.0.47

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

@@ -313,7 +313,7 @@ var Info = function Info() {
       return;
     }
     // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
-    if (state.modalOpen && !state.bookingId) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking') {
       handleSelectService();
     }
   }, [state.modalOpen, state.bookingId]);
@@ -326,6 +326,11 @@ var Info = function Info() {
       setSearch("");
     }
   }, [state.service.addModal]);
+  useEffect(function () {
+    if (state.renderType === "eventBooking" && state.modalOpen) {
+      getServices();
+    }
+  }, [state.renderType, state.modalOpen]);
   var addButton = useMemo(function () {
     if (state.renderType === "eventBooking") {
       return isService ? /*#__PURE__*/React.createElement("div", {
@@ -351,6 +356,7 @@ var Info = function Info() {
       }
     });
   }, [state.renderType, showAddButton, isService, state.service.value, loading]);
+  console.log(state.service.addModal, 'state.service.addModal');
   return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : (_state$service3$cache = _state$service3.cacheItem) === null || _state$service3$cache === void 0 ? void 0 : _state$service3$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
     loading: true,
     active: true,

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

@@ -1,7 +1,7 @@
 // 商品是套餐或单规格多规格
 export var getIsBundleOrCombination = function getIsBundleOrCombination(productDetail) {
-  var _productDetail$bundle, _productDetail$option, _productDetail$varian;
-  if (productDetail !== null && productDetail !== void 0 && (_productDetail$bundle = productDetail.bundle_group) !== null && _productDetail$bundle !== void 0 && _productDetail$bundle.length || productDetail !== null && productDetail !== void 0 && (_productDetail$option = productDetail.option_group) !== null && _productDetail$option !== void 0 && _productDetail$option.length || productDetail !== null && productDetail !== void 0 && (_productDetail$varian = productDetail.variant) !== null && _productDetail$varian !== void 0 && _productDetail$varian.length) {
+  var _productDetail$bundle;
+  if (productDetail !== null && productDetail !== void 0 && (_productDetail$bundle = productDetail.bundle_group) !== null && _productDetail$bundle !== void 0 && _productDetail$bundle.length) {
     return true;
   }
   return false;

package/lib/components/booking/info/service/addService/index.js

@@ -228,7 +228,7 @@ var Info = () => {
     )) {
       return;
     }
-    if (state.modalOpen && !state.bookingId) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking") {
       handleSelectService();
     }
   }, [state.modalOpen, state.bookingId]);
@@ -241,6 +241,11 @@ var Info = () => {
       setSearch("");
     }
   }, [state.service.addModal]);
+  (0, import_react.useEffect)(() => {
+    if (state.renderType === "eventBooking" && state.modalOpen) {
+      getServices();
+    }
+  }, [state.renderType, state.modalOpen]);
   const addButton = (0, import_react.useMemo)(() => {
     if (state.renderType === "eventBooking") {
       return isService ? /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } }) : /* @__PURE__ */ import_react.default.createElement(
@@ -270,6 +275,7 @@ var Info = () => {
     state.service.value,
     loading
   ]);
+  console.log(state.service.addModal, "state.service.addModal");
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_c = (_b = state.service) == null ? void 0 : _b.cacheItem) == null ? void 0 : _c.autoClose) && /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, round: true }), addButton, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {

package/lib/components/booking/info/utils.js

@@ -23,8 +23,8 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var getIsBundleOrCombination = (productDetail) => {
-  var _a, _b, _c;
-  if (((_a = productDetail == null ? void 0 : productDetail.bundle_group) == null ? void 0 : _a.length) || ((_b = productDetail == null ? void 0 : productDetail.option_group) == null ? void 0 : _b.length) || ((_c = productDetail == null ? void 0 : productDetail.variant) == null ? void 0 : _c.length)) {
+  var _a;
+  if ((_a = productDetail == null ? void 0 : productDetail.bundle_group) == null ? void 0 : _a.length) {
     return true;
   }
   return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.46",
+  "version": "3.0.47",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",