@pisell/private-materials 6.1.16 → 6.1.18

package/lib/components/ticketBooking/hooks/pisellos/useCustomer.js

@@ -106,10 +106,13 @@ var useCustomer = (props) => {
     setLoading(false);
   });
   const selectCustomer = (0, import_ahooks.useMemoizedFn)((customer) => {
-    bookingTicket.setActiveCustomer(customer);
+    var _a, _b;
+    (_a = bookingTicket == null ? void 0 : bookingTicket.setActiveCustomer) == null ? void 0 : _a.call(bookingTicket, customer);
+    (_b = props.changeCustomerToGlobalState) == null ? void 0 : _b.call(props, customer);
   });
   const addCustomerToFirst = (0, import_ahooks.useMemoizedFn)((customer) => {
-    bookingTicket.addCustomerToFirst(customer);
+    var _a;
+    (_a = bookingTicket == null ? void 0 : bookingTicket.addCustomerToFirst) == null ? void 0 : _a.call(bookingTicket, customer);
   });
   return {
     // 客户列表

package/lib/components/ticketBooking/hooks/pisellos/useScanManager.d.ts

@@ -0,0 +1,6 @@
+declare const useScanManager: () => {
+    disableAllScanListeners: () => void;
+    enableAllScanListeners: () => void;
+    clearAllScanListenersTaskQueue: () => void;
+};
+export default useScanManager;

package/lib/components/ticketBooking/hooks/pisellos/useScanManager.js

@@ -0,0 +1,44 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/ticketBooking/hooks/pisellos/useScanManager.ts
+var useScanManager_exports = {};
+__export(useScanManager_exports, {
+  default: () => useScanManager_default
+});
+module.exports = __toCommonJS(useScanManager_exports);
+var import_bookingTicket = require("./bookingTicket");
+var import_ahooks = require("ahooks");
+var useScanManager = () => {
+  const bookingTicket = (0, import_bookingTicket.useBookingTicket)();
+  const disableAllScanListeners = (0, import_ahooks.useMemoizedFn)(() => {
+    bookingTicket.disableAllScanListeners();
+  });
+  const enableAllScanListeners = (0, import_ahooks.useMemoizedFn)(() => {
+    bookingTicket.enableAllScanListeners();
+  });
+  const clearAllScanListenersTaskQueue = (0, import_ahooks.useMemoizedFn)(() => {
+    bookingTicket.clearAllScanListenersTaskQueue();
+  });
+  return {
+    disableAllScanListeners,
+    enableAllScanListeners,
+    clearAllScanListenersTaskQueue
+  };
+};
+var useScanManager_default = useScanManager;

package/lib/components/ticketBooking/utils/index.d.ts

@@ -14,6 +14,7 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: any;
     quantity: number;
 } | undefined;
+export declare const isSameProduct: (a: any, b: any) => boolean;
 export declare const addService: (list: any[], addItem: any, state: any) => {
     list: any[];
     quantity: any;
@@ -40,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "customer" | "wallet" | "walletPass" | "product" | "local_product";
     data: any;
     scanCode: string;
 } | null;
@@ -57,4 +58,5 @@ export declare const formatScanGlobal: (data: ScanData) => {
     data: any;
     scanCode: string;
 } | null | undefined;
+export declare const createSimpleCacheItem: (item: any, e: any, state: any) => any;
 export {};

package/lib/components/ticketBooking/utils/index.js

@@ -31,6 +31,7 @@ var utils_exports = {};
 __export(utils_exports, {
   addService: () => addService,
   addServiceScroll: () => addServiceScroll,
+  createSimpleCacheItem: () => createSimpleCacheItem,
   formatBookingList: () => formatBookingList,
   formatDateToStr: () => formatDateToStr,
   formatHolder: () => formatHolder,
@@ -45,12 +46,14 @@ __export(utils_exports, {
   getIsParallelResourcesBooking: () => getIsParallelResourcesBooking,
   getIsShowNumber: () => getIsShowNumber,
   getNextTimeSlice: () => getNextTimeSlice,
+  isSameProduct: () => isSameProduct,
   restoreProductOtherData: () => restoreProductOtherData
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("../../booking/info/service2/utils");
 var import_utils2 = require("@pisell/utils");
+var import_utils3 = require("@pisell/utils");
 var formatDateToStr = (date) => {
   const format = (val) => {
     return (0, import_dayjs.default)(val).format("YYYY-MM-DD HH:mm:ss");
@@ -279,10 +282,28 @@ var formatScanGlobal = (data) => {
     return { searchType, data: resultData, scanCode };
   }
 };
+var createSimpleCacheItem = (item, e, state) => {
+  let cacheItem = {
+    ...item,
+    product_id: item.id,
+    _id: (0, import_utils3.getUniqueId)(),
+    _key: e.key,
+    _extend: {
+      start_date: state.date.value,
+      quantity: (e == null ? void 0 : e.quantity) || 1,
+      price: item.price,
+      product_name: item.title,
+      other: e
+    },
+    new: 1
+  };
+  return cacheItem;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addService,
   addServiceScroll,
+  createSimpleCacheItem,
   formatBookingList,
   formatDateToStr,
   formatHolder,
@@ -297,5 +318,6 @@ var formatScanGlobal = (data) => {
   getIsParallelResourcesBooking,
   getIsShowNumber,
   getNextTimeSlice,
+  isSameProduct,
   restoreProductOtherData
 });

package/lib/components/wallet/hooks/useWalletCard.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { IWalletListItemProps } from '../serve';
 /**
  * 钱包卡片Hook的参数

package/lib/components/workSpaceList/components/Modal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/lib/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './../../index.less';
 declare const Search: () => JSX.Element;
 export default Search;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { IClientNameProps } from './type';
 declare const ClientName: ({ className, dataSource, style }: IClientNameProps) => JSX.Element | null;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const GenderField: (props: any) => JSX.Element;
 export default GenderField;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/lib/plus/noteModal/AddTempModal.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const AddTempModal: ({ open, onCancel, onConfirm, }: {
     open: boolean;

package/lib/pro/pisellNumberSelector/index.js

@@ -55,6 +55,7 @@ var PisellNumberSelector = ({
 }) => {
   const [open, setOpen] = (0, import_react.useState)(false);
   const [inputValue, setInputValue] = (0, import_react.useState)(value.toString());
+  const [tempValue, setTempValue] = (0, import_react.useState)(value.toString());
   const KeyboardItems = (0, import_react.useMemo)(() => {
     return [
       {
@@ -145,20 +146,21 @@ var PisellNumberSelector = ({
   };
   const handleChange = (e) => {
     if (!e) {
-      onChange == null ? void 0 : onChange(min);
+      setTempValue(min.toString());
       return;
     }
     if (e === "delete") {
-      onChange == null ? void 0 : onChange(Number(inputValue.slice(0, -1)));
+      const newTempValue = tempValue.slice(0, -1);
+      setTempValue(newTempValue || "0");
       return;
     } else if (e === "verify") {
-      const newValue = parseInt(inputValue) || 0;
+      const newValue = parseInt(tempValue) || 0;
       const clampedValue = Math.max(min, Math.min(max, newValue));
       onChange == null ? void 0 : onChange(clampedValue);
       setOpen(false);
       return;
     } else {
-      onChange == null ? void 0 : onChange(Number(e));
+      setTempValue(e);
     }
   };
   const adjustPriceContent = (0, import_react.useMemo)(() => {
@@ -166,20 +168,35 @@ var PisellNumberSelector = ({
     return /* @__PURE__ */ import_react.default.createElement(
       import_numberKeyboard.default,
       {
-        selectType: "dark",
-        value: value.toString(),
+        value: tempValue,
         max,
         onChange: handleChange,
         onOk: () => {
+          const newValue = parseInt(tempValue) || 0;
+          const clampedValue = Math.max(min, Math.min(max, newValue));
+          onChange == null ? void 0 : onChange(clampedValue);
           setOpen(false);
         }
       }
     );
-  }, [enablePriceAdjust, inputValue, KeyboardItems, max]);
+  }, [enablePriceAdjust, tempValue, max, handleChange]);
   const handleNumberClick = () => {
     if (disabled) return;
     if (enablePriceAdjust) {
-      setInputValue(value.toString());
+      setTempValue(value.toString());
+    }
+  };
+  const handleOpenChange = (visible) => {
+    setOpen(visible);
+    if (visible) {
+      setTempValue(value.toString());
+    } else {
+      const tempNumber = parseInt(tempValue) || 0;
+      const clampedValue = Math.max(min, Math.min(max, tempNumber));
+      if (clampedValue !== value) {
+        onChange == null ? void 0 : onChange(clampedValue);
+      }
+      setTempValue(value.toString());
     }
   };
   const numberDisplayElement = enablePriceAdjust ? /* @__PURE__ */ import_react.default.createElement(
@@ -209,20 +226,13 @@ var PisellNumberSelector = ({
       content: adjustPriceContent,
       trigger: ["click"],
       overlayInnerStyle: { padding: 0 },
-      onOpenChange: (visible) => {
-        setOpen(visible);
-        if (visible) {
-          setInputValue(value.toString());
-        } else {
-          setInputValue(value.toString());
-        }
-      },
       destroyTooltipOnHide: true,
       arrow: false,
       align: {
         offset: [0, 0]
       },
-      overlayClassName: "pisell-number-selector-popover"
+      overlayClassName: "pisell-number-selector-popover",
+      onOpenChange: handleOpenChange
     },
     numberDisplayElement
   ) : numberDisplayElement;

package/lib/pro/pisellPhoneKeyboard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import './index.less';
 interface PisellPhoneKeyboardProps {

package/lib/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.1.16",
+  "version": "6.1.18",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,7 +61,7 @@
     "styled-components": "^6.0.0-rc.3",
     "@pisell/date-picker": "3.0.4",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.1.5",
+    "@pisell/materials": "6.1.6",
     "@pisell/utils": "3.0.0"
   },
   "peerDependencies": {