@pisell/private-materials 3.0.45 → 3.0.47

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

@@ -13,5 +13,5 @@ export interface InfoProps {
     setGlobalState: any;
 }
 export declare const formatProducts: (values: any) => any;
-declare const Addons: (props: any) => JSX.Element;
+declare const Addons: (props: any) => any;
 export default Addons;

package/es/components/booking/addons/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/booking/forms/forms.d.ts

@@ -21,5 +21,5 @@ export interface InfoProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:10
  */
-declare const Forms: (props: any) => JSX.Element;
+declare const Forms: (props: any) => any;
 export default Forms;

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

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Forms: (props: any) => JSX.Element;
+declare const Forms: (props: any) => any;
 export default Forms;

package/es/components/booking/forms/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,2 +1,2 @@
-declare const Booking: (props: any) => JSX.Element;
+declare const Booking: (props: any) => any;
 export default Booking;

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

@@ -8,5 +8,5 @@ export interface InfoProps {
     slot: any;
     setState: any;
 }
-declare const Info: (props: any) => JSX.Element;
+declare const Info: (props: any) => any;
 export default Info;

package/es/components/booking/info/model.d.ts

@@ -1,9 +1,10 @@
+/// <reference types="react" />
 import { FormState } from "../model";
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -30,6 +30,7 @@ import { getProductDetail } from "../serve";
 import { getIsBundleOrCombination } from "../../utils";
 import { formatProductListByCategory, getProductTotalPrice, request, getCacheParams, deleteCacheParams } from "../../../utils";
 import { locales, getUniqueId } from "@pisell/utils";
+import { useUpdateEffect } from "ahooks";
 var shopList = [2886, 4422, 5538, 6930];
 var getCacheResourceId = function getCacheResourceId() {
   var serviceParams = getCacheParams();
@@ -217,8 +218,6 @@ var Info = function Info() {
     };
   }();
   var handleSelectService = function handleSelectService() {
-    getServices();
-    setSearch("");
     dispatch({
       type: "setService",
       payload: {
@@ -314,13 +313,24 @@ var Info = function Info() {
       return;
     }
     // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
-    if (state.modalOpen && !state.bookingId) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking') {
       handleSelectService();
     }
   }, [state.modalOpen, state.bookingId]);
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
+  useUpdateEffect(function () {
+    if (state.service.addModal) {
+      getServices();
+      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", {
@@ -346,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/es/components/booking/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -88,7 +89,7 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => JSX.Element;
+declare const Notes: (props: any) => any;
 export default Notes;

package/es/components/booking/notes/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => JSX.Element;
+declare const Payments: (props: any) => any;
 export default Payments;

package/es/components/booking/payments/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => JSX.Element;
+declare const Schedules: (props: any) => any;
 export default Schedules;

package/es/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,7 +69,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/addons/index.d.ts

@@ -13,5 +13,5 @@ export interface InfoProps {
     setGlobalState: any;
 }
 export declare const formatProducts: (values: any) => any;
-declare const Addons: (props: any) => JSX.Element;
+declare const Addons: (props: any) => any;
 export default Addons;

package/lib/components/booking/addons/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/forms/forms.d.ts

@@ -21,5 +21,5 @@ export interface InfoProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:10
  */
-declare const Forms: (props: any) => JSX.Element;
+declare const Forms: (props: any) => any;
 export default Forms;

package/lib/components/booking/forms/index.d.ts

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Forms: (props: any) => JSX.Element;
+declare const Forms: (props: any) => any;
 export default Forms;

package/lib/components/booking/forms/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/index.d.ts

@@ -1,2 +1,2 @@
-declare const Booking: (props: any) => JSX.Element;
+declare const Booking: (props: any) => any;
 export default Booking;

package/lib/components/booking/info/index.d.ts

@@ -8,5 +8,5 @@ export interface InfoProps {
     slot: any;
     setState: any;
 }
-declare const Info: (props: any) => JSX.Element;
+declare const Info: (props: any) => any;
 export default Info;

package/lib/components/booking/info/model.d.ts

@@ -1,9 +1,10 @@
+/// <reference types="react" />
 import { FormState } from "../model";
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -45,6 +45,7 @@ var import_serve = require("../serve");
 var import_utils = require("../../utils");
 var import_utils2 = require("../../../utils");
 var import_utils3 = require("@pisell/utils");
+var import_ahooks = require("ahooks");
 var shopList = [2886, 4422, 5538, 6930];
 var getCacheResourceId = () => {
   const serviceParams = (0, import_utils2.getCacheParams)();
@@ -140,8 +141,6 @@ var Info = () => {
     });
   };
   const handleSelectService = () => {
-    getServices();
-    setSearch("");
     dispatch({
       type: "setService",
       payload: {
@@ -229,13 +228,24 @@ var Info = () => {
     )) {
       return;
     }
-    if (state.modalOpen && !state.bookingId) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== "eventBooking") {
       handleSelectService();
     }
   }, [state.modalOpen, state.bookingId]);
   const showAddButton = (0, import_react.useMemo)(() => {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
+  (0, import_ahooks.useUpdateEffect)(() => {
+    if (state.service.addModal) {
+      getServices();
+      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(
@@ -265,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/lib/components/booking/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -88,7 +89,7 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/notes/index.d.ts

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => JSX.Element;
+declare const Notes: (props: any) => any;
 export default Notes;

package/lib/components/booking/notes/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/payments/index.d.ts

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => JSX.Element;
+declare const Payments: (props: any) => any;
 export default Payments;

package/lib/components/booking/payments/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => JSX.Element;
+declare const Schedules: (props: any) => any;
 export default Schedules;

package/lib/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,7 +69,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.45",
+  "version": "3.0.47",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -58,8 +58,8 @@
     "ahooks": "^3.7.6",
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
-    "@pisell/utils": "1.0.24",
     "@pisell/icon": "0.0.8",
+    "@pisell/utils": "1.0.24",
     "@pisell/date-picker": "1.0.69"
   },
   "peerDependencies": {