@pisell/private-materials 3.3.4 → 3.3.6

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -93,7 +93,7 @@ var DepositModal = function DepositModal(props) {
     onOk: onCancel
   }, /*#__PURE__*/React.createElement(Spin, {
     style: {
-      minHeight: '100%'
+      minHeight: '200px'
     },
     spinning: loading
   }, policy !== null && policy !== void 0 && policy.content ? /*#__PURE__*/React.createElement("div", {

package/es/components/appointmentBooking/hooks.js

@@ -146,40 +146,37 @@ export var useAppointmentBookingProduct = function useAppointmentBookingProduct(
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
-            return appointmentBooking.loadAllSchedule();
-          case 2:
             if (!(bookingProcess === 'date_first')) {
-              _context2.next = 13;
+              _context2.next = 11;
               break;
             }
-            _context2.next = 5;
+            _context2.next = 3;
             return appointmentBooking.getDateRange();
-          case 5:
+          case 3:
             dates = _context2.sent;
             if (!(!dates || !dates.length)) {
-              _context2.next = 8;
+              _context2.next = 6;
               break;
             }
             return _context2.abrupt("return");
-          case 8:
+          case 6:
             _ref5 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {}, _productModuleParams = _ref5.productModuleParams;
-            _context2.next = 11;
+            _context2.next = 9;
             return appointmentBooking.loadProductByScheduleDate(_objectSpread({
               date: (_dates$ = dates[0]) === null || _dates$ === void 0 ? void 0 : _dates$.date
             }, _productModuleParams));
-          case 11:
+          case 9:
             _productList = _context2.sent;
             return _context2.abrupt("return", _productList);
-          case 13:
+          case 11:
             // 先选商品
             _ref6 = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.otherParams) || {}, productModuleParams = _ref6.productModuleParams;
-            _context2.next = 16;
+            _context2.next = 14;
             return appointmentBooking.loadProducts(productModuleParams);
-          case 16:
+          case 14:
             productList = _context2.sent;
             return _context2.abrupt("return", productList);
-          case 18:
+          case 16:
           case "end":
             return _context2.stop();
         }

package/es/components/appointmentBooking/index.js

@@ -12,6 +12,9 @@ var AppointmentBooking = function AppointmentBooking() {
   var context = useEngineContext();
   locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en');
   var appointmentBooking = useAppointmentBooking();
+
+  // 初始化项目的时候，用于预加载 schedule 数据
+  appointmentBooking.loadAllSchedule();
   var currentUser = formatCurrentUser();
   useEffect(function () {
     var _appointmentBooking$o;

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

@@ -112,13 +112,14 @@ var VoucherCard = function VoucherCard(props) {
       dispatch({
         type: 'setService',
         payload: _objectSpread(_objectSpread({}, services), {}, {
-          value: val.productList
+          value: ((val === null || val === void 0 ? void 0 : val.productList) || []).filter(Boolean)
         })
       });
     }
   }, [JSON.stringify(serviceMemo), isBooking4Shop]);
   var fn = useMemoizedFn(function (result) {
-    if (result.productList.some(function (item) {
+    var _result$productList;
+    if (!(result !== null && result !== void 0 && result.productList) || result !== null && result !== void 0 && (_result$productList = result.productList) !== null && _result$productList !== void 0 && _result$productList.some(function (item) {
       return !item;
     })) {
       return;

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

@@ -95,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9];
+  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -74,7 +74,7 @@ var DepositModal = (props) => {
       okText: import_utils.locales.getText("pisell2.appointment.deposit.close"),
       onOk: onCancel
     },
-    /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { style: { minHeight: "100%" }, spinning: loading }, (policy == null ? void 0 : policy.content) ? /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { style: { minHeight: "200px" }, spinning: loading }, (policy == null ? void 0 : policy.content) ? /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "policy-content",

package/lib/components/appointmentBooking/hooks.js

@@ -119,7 +119,6 @@ var useAppointmentBookingProduct = () => {
   const { bookingProcess, bookingSubject } = productModuleParams || {};
   const getProducts = async () => {
     var _a;
-    await appointmentBooking.loadAllSchedule();
     if (bookingProcess === "date_first") {
       const dates = await appointmentBooking.getDateRange();
       if (!dates || !dates.length) return;

package/lib/components/appointmentBooking/index.js

@@ -46,6 +46,7 @@ var AppointmentBooking = () => {
   const context = (0, import_useEngineContext.default)();
   import_utils.locales.init(import_locales.default, ((_b = (_a = context == null ? void 0 : context.engine) == null ? void 0 : _a.props) == null ? void 0 : _b.locale) || "en");
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
+  appointmentBooking.loadAllSchedule();
   const currentUser = (0, import_utils2.formatCurrentUser)();
   (0, import_react.useEffect)(() => {
     var _a2;

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

@@ -114,13 +114,14 @@ var VoucherCard = (props) => {
         type: "setService",
         payload: {
           ...services,
-          value: val.productList
+          value: ((val == null ? void 0 : val.productList) || []).filter(Boolean)
         }
       });
     }
   }, [JSON.stringify(serviceMemo), isBooking4Shop]);
   const fn = (0, import_ahooks.useMemoizedFn)((result) => {
-    if (result.productList.some((item) => !item)) {
+    var _a2;
+    if (!(result == null ? void 0 : result.productList) || ((_a2 = result == null ? void 0 : result.productList) == null ? void 0 : _a2.some((item) => !item))) {
       return;
     }
     dispatch({

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

@@ -103,7 +103,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9];
+  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.4",
+  "version": "3.3.6",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/materials": "3.3.3",
+    "@pisell/utils": "1.0.42",
+    "@pisell/materials": "3.3.5",
     "@pisell/date-picker": "3.0.2",
-    "@pisell/icon": "0.0.11",
-    "@pisell/utils": "1.0.42"
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/appointmentBooking/components/Cart/ContinueButton/index.d.ts

@@ -1,8 +0,0 @@
-import React from 'react';
-import './index.less';
-interface ContinueButtonProps {
-    onContinue?: () => void;
-    onIsErrorResource?: (isError: boolean) => void;
-}
-declare const ContinueButton: React.FC<ContinueButtonProps>;
-export default ContinueButton;

package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts

@@ -1,3 +0,0 @@
-import './index.less';
-declare const Total: ({ className, isFooter }: any) => JSX.Element;
-export default Total;

package/es/components/appointmentBooking/components/Cart/utils.d.ts

@@ -1,77 +0,0 @@
-import { locales } from '@pisell/utils';
-interface CheckLoginParams {
-    isLogin: boolean;
-    openLoginModal: (params: {
-        callback: (status: string) => void;
-    }) => void;
-    isFormSubject: boolean;
-    utils: any;
-    accountLists: any[];
-    appointmentBooking: any;
-    getHolders: () => void;
-}
-export declare const checkLogin: ({ isLogin, openLoginModal, isFormSubject, utils, accountLists, appointmentBooking, getHolders, }: CheckLoginParams) => Promise<boolean>;
-interface CheckHolderParams {
-    isFormSubject: boolean;
-    checkAccount: (type: string) => boolean;
-    carts: any[];
-}
-export declare const checkHolder: ({ isFormSubject, checkAccount, carts }: CheckHolderParams) => false | any[];
-interface CheckResourceParams {
-    carts: any[];
-    resources: any[];
-}
-/**
- * @title: 检测资源数据
- * @description:
- * @param {CheckResourceParams} param1
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-29 18:02
- */
-export declare const checkResource: ({ carts, resources }: CheckResourceParams) => false | any[];
-interface CheckResourceParams {
-    carts: any[];
-}
-interface HandleFormStepParams {
-    newCarts: any[];
-    addStep: (params: {
-        index: number;
-        key: string;
-        description: string;
-    }) => void;
-    removeStep: (key: string) => void;
-    setResourceOtherParams: (params: any) => void;
-    resourceOtherParams: any;
-    index: number;
-    locales: typeof locales;
-}
-export declare const handleFormStep: ({ newCarts, addStep, removeStep, setResourceOtherParams, resourceOtherParams, index, locales, }: HandleFormStepParams) => void;
-/**
- * 滚动到第一个错误卡片
- * @param {string} selector - 错误卡片的 class 选择器
- */
-export declare const scrollToFirstErrorCard: (selector?: string) => void;
-export declare type StepKey = 'select-resource' | 'fill-form' | 'select-time' | 'confirm-information' | 'select-service' | 'select-date' | 'select-guest';
-interface HandleResourceParams {
-    handleCheckResource: () => boolean;
-    newCarts: any[];
-    locales: typeof locales;
-    addStep: (params: {
-        index: number;
-        key: string;
-        description: string;
-    }, key?: StepKey) => void;
-    removeStep: (key: string) => void;
-    setResourceOtherParams: (params: any) => void;
-    resourceOtherParams: any;
-    currentStep: any;
-    getResourceTimeSlot: () => void;
-    appointmentBooking: any;
-    onIsErrorResource?: (isError: boolean) => void;
-    stepList: any[];
-}
-export declare const handleResource: ({ handleCheckResource, newCarts, addStep, removeStep, setResourceOtherParams, resourceOtherParams, currentStep, getResourceTimeSlot, appointmentBooking, onIsErrorResource, stepList }: HandleResourceParams) => Promise<void>;
-export declare const stepHandlers: Record<StepKey, (params: any) => Promise<any>>;
-export declare const handleContinueStep: (key: StepKey, params: any) => Promise<any>;
-export {};

package/es/components/appointmentBooking/components/Content/index.d.ts

@@ -1,3 +0,0 @@
-import './index.less';
-declare const Layout: () => JSX.Element;
-export default Layout;

package/es/components/appointmentBooking/components/Date/index.d.ts

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

package/es/components/appointmentBooking/components/Footer/index.d.ts

@@ -1,3 +0,0 @@
-import './index.less';
-declare const Footer: ({ onContinue }: any) => JSX.Element;
-export default Footer;

package/es/components/appointmentBooking/components/TimeSlicing/index.d.ts

@@ -1,3 +0,0 @@
-import './index.less';
-declare const Resource: () => JSX.Element;
-export default Resource;

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

package/es/components/appointmentBooking/deposit/index.d.ts

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

package/es/components/appointmentBooking/hooks.d.ts

@@ -1,104 +0,0 @@
-export declare const useAppointmentBooking: () => any;
-export declare const useShopDiscount: () => any;
-export declare const contextUtils: () => any;
-/**
- * @title: 监听步骤发生变化
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:11
- */
-export declare const useAppointmentBookingStep: () => {
-    getStepIndex: (type: string, skipNumber?: number) => any;
-    stepList: any;
-    removeStep: (key: string) => any;
-    addStep: (props: any, stepKey?: string) => any;
-};
-/**
- * @title: 获取商品数据
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:12
- */
-export declare const useAppointmentBookingProduct: () => {
-    checkProductType: (productId: number) => Promise<any>;
-    getProducts: () => Promise<any>;
-};
-/**
- * @title: 更新购物车数据
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:12
- */
-export declare const useAppointmentBookingCart: () => void;
-/**
- * @title: 获取登录状态
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:14
- */
-export declare const useAppointmentBookingLogin: () => {
-    isLogin: boolean;
-    openLoginModal: (params: {
-        callback: any;
-    }) => void;
-};
-/**
- * @title: 获取账户
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:15
- */
-export declare const useAppointmentBookingAccount: () => {
-    accountLists: any;
-    getHolders: () => Promise<any>;
-    form_id: any;
-    addAccount: (val: any, type?: string) => Promise<any>;
-    checkAccount: (type: any) => any;
-};
-/**
- * @title: 获取资源数据
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-15 11:29
- */
-export declare const useAppointmentBookingResource: () => {
-    getResourceTimeSlot: (index?: number) => Promise<void>;
-    getResourceList: () => {
-        resources: any;
-        resourceCodes: any;
-    };
-    autoSelectAllProductResources: (index?: number) => Promise<any>;
-};
-/**
- * @title: 是否跳过资源选择步骤
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-21 11:47
- */
-export declare const useIsSkipResourceStep: () => {
-    checkSkipResourceStep: () => Promise<boolean>;
-};
-/**
- * @title: 获取预约配置
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-04-24 18:15
- */
-export declare const useAppointmentBookingSetting: () => {
-    isDateSelectedFirst: boolean;
-    isFormSubject: boolean;
-    customPageId: any;
-    getLoadAllSchedule: () => void;
-    bookingSubject: any;
-    setOtherData: (key: string, val: any) => any;
-    getOtherData: (key: string) => any;
-    formName: any;
-};

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

@@ -1,3 +0,0 @@
-import './index.less';
-declare const AppointmentBooking: () => JSX.Element;
-export default AppointmentBooking;