@pisell/private-materials 6.6.48 → 6.6.50

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,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/shoppingCart/components/Cart/index.less

@@ -71,6 +71,7 @@
     line-height: 24px; /* 150% */
     display: flex;
     align-items: center;
+    width: max-content;
     .anticon {
       font-size: 18px;
       margin-right: 6px;

package/lib/components/shoppingCart/hooks/useClearCart.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const useClearCart: (key?: number | undefined) => React.JSX.Element | null;
+declare const useClearCart: (key?: number | undefined) => React.JSX.Element;
 export default useClearCart;

package/lib/components/shoppingCart/hooks/useClearCart.js

@@ -38,6 +38,7 @@ var import_materials = require("@pisell/materials");
 var import_useContext = require("./useContext");
 var import_utils = require("@pisell/utils");
 var useClearCart = (key) => {
+  const [open, setOpen] = (0, import_react.useState)(false);
   const { state, onChange } = (0, import_useContext.useContext)();
   const { isProductList, disabledEdit, holders, isHideClearCart } = state;
   const handleClear = () => {
@@ -47,20 +48,50 @@ var useClearCart = (key) => {
     } else {
       const ids = products == null ? void 0 : products.map((item) => item == null ? void 0 : item._id);
       onChange(ids, "delete_holders", key);
+      setOpen(false);
       return;
       products = products.filter((item) => (item == null ? void 0 : item.holder_id) !== key);
     }
   };
-  return !disabledEdit && (holders == null ? void 0 : holders.length) > 0 && !isHideClearCart ? /* @__PURE__ */ import_react.default.createElement(
-    "span",
-    {
-      className: (0, import_classnames.default)("pisell-lowcode__shopping-cart-clear-btn", {
-        "pisell-lowcode__shopping-cart-clear-btn-empty": isProductList
-      }),
-      onClick: handleClear
-    },
-    /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
-    /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
-  ) : null;
+  const handleOpenModal = (0, import_react.useCallback)(() => {
+    setOpen(true);
+  }, []);
+  const handleCancel = (0, import_react.useCallback)(() => {
+    setOpen(false);
+  }, []);
+  return (0, import_react.useMemo)(() => {
+    const showClearBtn = !disabledEdit && (holders == null ? void 0 : holders.length) > 0 && !isHideClearCart;
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showClearBtn ? /* @__PURE__ */ import_react.default.createElement(
+      "span",
+      {
+        className: (0, import_classnames.default)("pisell-lowcode__shopping-cart-clear-btn", {
+          "pisell-lowcode__shopping-cart-clear-btn-empty": isProductList
+        }),
+        onClick: handleOpenModal
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
+      /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
+    ) : null, /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellModal,
+      {
+        open,
+        title: import_utils.locales.getText(
+          "pisell2.booking.info.text.clear-cart-modal.title"
+        ),
+        onOk: handleClear,
+        onCancel: handleCancel,
+        okText: import_utils.locales.getText(
+          "pisell2.booking.info.text.clear-cart-modal.confirm"
+        ),
+        cancelText: import_utils.locales.getText(
+          "pisell2.booking.info.text.clear-cart-modal.cancel"
+        ),
+        destroyOnClose: true
+      },
+      /* @__PURE__ */ import_react.default.createElement("div", { style: { margin: "24px 0" } }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText(
+        "pisell2.booking.info.text.clear-cart-modal.content"
+      )))
+    ));
+  }, [open, disabledEdit, holders == null ? void 0 : holders.length, isHideClearCart, isProductList]);
 };
 var useClearCart_default = useClearCart;

package/lib/components/ticketBooking/index.js

@@ -233,7 +233,7 @@ var ticketBooking_default = (props) => {
   }, [isShowMenuBar, activeNavKey, propsProductDisplayConfig]);
   const storeRef = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
-  const { pisellos, pisellosAllModule } = (_a = context.appHelper) == null ? void 0 : _a.utils;
+  const { pisellos, pisellosAllModule, businessUtils } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const { BookingTicket, ShopDiscountImpl } = pisellosAllModule || {};
   import_utils.locales.init(
     import_locales.default,
@@ -251,12 +251,14 @@ var ticketBooking_default = (props) => {
     storeRef.current = store;
   }, [bookingConfigParams, productExtensionType]);
   (0, import_react.useMemo)(() => {
+    var _a2;
     if (BookingTicket) {
       pisellos == null ? void 0 : pisellos.registerModule(new BookingTicket((0, import_utils3.getBookingTicketKey)(osKey)), {
         initialState: {},
         otherParams: {
           cacheId: (0, import_utils3.getBookingTicketKey)(osKey),
-          platform: "shop"
+          platform: "shop",
+          isFranchisee: (_a2 = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _a2.call(businessUtils, "franchisee")
         }
       });
     }

package/lib/plus/clinetSearch/index.d.ts

@@ -10,6 +10,7 @@ interface ClientSearchProps extends Omit<ComprehensiveSearchProps, 'resultDispla
     hasMore?: boolean;
     onLoadMore?: () => void;
     state?: any;
+    resultLoading?: boolean;
 }
 export declare type ClientSearchRef = {
     resetScrollPosition: () => void;

package/lib/plus/clinetSearch/index.js

@@ -52,6 +52,7 @@ var ClientSearch = (0, import_react.forwardRef)(
     hasMore,
     onLoadMore,
     state,
+    resultLoading,
     ...props
   }, ref) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -85,12 +86,21 @@ var ClientSearch = (0, import_react.forwardRef)(
           ref: scrollContainerRef,
           id: "client-search_infinite-scroll",
           style: {
+            position: "relative",
             height: "calc(100% - 40px)",
             overflowY: "auto",
             overflowX: "hidden",
             display: "flex"
           }
         },
+        resultLoading && /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Spin,
+          {
+            spinning: resultLoading || false,
+            className: "pisell-client-search-result-loading",
+            size: "large"
+          }
+        ),
         /* @__PURE__ */ import_react.default.createElement(
           import_InfiniteScroll.default,
           {

package/lib/plus/clinetSearch/index.less

@@ -93,3 +93,16 @@
     }
   }
 }
+
+.pisell-client-search-result-loading {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: rgba(255, 255, 255, 0.8);
+  z-index: 10;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.48",
+  "version": "6.6.50",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,10 +61,10 @@
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
-    "@pisell/date-picker": "3.0.7",
     "@pisell/utils": "3.0.2",
+    "@pisell/materials": "6.6.14",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.6.14"
+    "@pisell/date-picker": "3.0.7"
   },
   "peerDependencies": {
     "react": "^18.0.0",