@pisell/private-materials 3.0.12 → 3.0.14-2.gray

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

@@ -1,11 +1,12 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 interface CustomSelectProps {
     options: any[];
     onValueChange: (value: any[]) => void;
     value: any[];
     rowKey: string;
     previewItemRender?: (item: any) => React.ReactNode;
+    previewItemTitleRender?: (item: any, index: number, values: any[]) => React.ReactNode;
     addButtonRender?: () => React.ReactNode;
     optionRender: (item: any) => React.ReactNode;
     addButtonProps?: any;
@@ -14,7 +15,7 @@ interface CustomSelectProps {
     loading?: boolean;
     previewItemClassName?: string;
     optionClassName?: string;
-    mode?: "single" | "multiple" | "form";
+    mode?: 'single' | 'multiple' | 'form';
     filterItem?: (item: any, search: string) => boolean;
     isPreview?: boolean;
     name?: string;
@@ -28,6 +29,9 @@ interface CustomSelectProps {
     onVirtualListScroll?: any;
     modalOpen?: boolean;
     closeCallback?: () => any;
+    autoFocus?: boolean;
+    showDropDown?: boolean;
+    handleOpenModal?: () => void;
 }
 declare const _default: React.ForwardRefExoticComponent<CustomSelectProps & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -54,6 +54,7 @@ var CustomSelect = (props, ref) => {
     drawerProps,
     createItemText = "",
     previewItemRender,
+    previewItemTitleRender,
     addButtonRender,
     optionRender,
     filterItem,
@@ -71,8 +72,12 @@ var CustomSelect = (props, ref) => {
     onVirtualListScroll,
     loadMore,
     modalOpen,
-    closeCallback
+    closeCallback,
+    autoFocus,
+    showDropDown = true,
+    handleOpenModal: propsHandleOpenModal
   } = props;
+  const searchRef = (0, import_react.useRef)();
   const [_value, set_value] = (0, import_react.useState)([]);
   const [search, setSearch] = (0, import_react.useState)("");
   const [open, setOpen] = (0, import_react.useState)(false);
@@ -81,9 +86,12 @@ var CustomSelect = (props, ref) => {
       setOpen(false);
     }
   }, [modalOpen]);
+  const strValue = (0, import_react.useMemo)(() => {
+    return JSON.stringify(value);
+  }, [value]);
   (0, import_react.useEffect)(() => {
     initValue();
-  }, [value]);
+  }, [strValue]);
   const initValue = () => {
     let _val = value;
     if (!value) {
@@ -95,20 +103,36 @@ var CustomSelect = (props, ref) => {
     }
     set_value(_val);
   };
-  const closeDrawer = () => {
+  const closeDrawer = (reset) => {
     setOpen(false);
     setSearch("");
+    if (reset) {
+      initValue();
+    }
     closeCallback == null ? void 0 : closeCallback();
   };
   const handleOpenModal = () => {
     if (disabled) {
       return;
     }
+    if (propsHandleOpenModal) {
+      propsHandleOpenModal();
+      return;
+    }
+    if (addButtonProps == null ? void 0 : addButtonProps.addCallback) {
+      addButtonProps == null ? void 0 : addButtonProps.addCallback();
+    }
     setOpen(true);
     initValue();
+    if (autoFocus) {
+      setTimeout(() => {
+        var _a, _b;
+        (_b = (_a = searchRef.current) == null ? void 0 : _a.focus) == null ? void 0 : _b.call(_a);
+      }, 100);
+    }
   };
-  const _onValueChange = (_val) => {
-    onValueChange(_val);
+  const _onValueChange = async (_val) => {
+    await onValueChange(_val);
   };
   const handleSelectItem = (item) => {
     let _val = (0, import_utils.changeArray)(_value, item, rowKey);
@@ -143,7 +167,7 @@ var CustomSelect = (props, ref) => {
         if (filterItem) {
           return filterItem(d, search);
         }
-        return isIncludes(d.key_name || "");
+        return isIncludes(d.main_field || "");
       });
     }
     return _list;
@@ -151,8 +175,8 @@ var CustomSelect = (props, ref) => {
   const isMore = (0, import_react.useMemo)(() => {
     return _value.length > 0;
   }, [_value]);
-  const handleApply = (_val) => {
-    _onValueChange(_val || _value);
+  const handleApply = async (_val) => {
+    await _onValueChange(_val || _value);
     closeDrawer();
   };
   (0, import_react.useImperativeHandle)(ref, () => {
@@ -184,8 +208,8 @@ var CustomSelect = (props, ref) => {
   const isShowAddButton = (0, import_react.useMemo)(() => {
     return (mode === "multiple" || mode === "single" && !isMore) && !disabled;
   }, [mode, isMore, disabled]);
-  return /* @__PURE__ */ import_react.default.createElement("div", null, isPreview ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__custom-select-cards" }, _value.map((d) => {
-    return /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", null, isPreview ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__custom-select-cards" }, _value.map((d, index) => {
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, previewItemTitleRender == null ? void 0 : previewItemTitleRender(d, index, _value), /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: (0, import_classnames.default)(
@@ -195,7 +219,7 @@ var CustomSelect = (props, ref) => {
         key: d[rowKey]
       },
       previewItemRender == null ? void 0 : previewItemRender(d),
-      /* @__PURE__ */ import_react.default.createElement(
+      showDropDown && /* @__PURE__ */ import_react.default.createElement(
         "div",
         {
           onClick: (e) => {
@@ -217,22 +241,31 @@ var CustomSelect = (props, ref) => {
           /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__custom-select-card-menu-wrap" }, /* @__PURE__ */ import_react.default.createElement(import_DotsVertical.default, { className: "pisell-lowcode__custom-select-card-menu-icon" }))
         )
       )
-    );
+    ));
   })), isShowAddButton ? addButtonRender ? addButtonRender() : /* @__PURE__ */ import_react.default.createElement(
     import_addButton.default,
     {
       showSub: isMore,
-      onClick: handleOpenModal,
-      ...addButtonProps
+      ...addButtonProps,
+      onClick: () => {
+        if (addButtonProps.onClick) {
+          addButtonProps.onClick();
+          return;
+        }
+        handleOpenModal();
+      }
     }
   ) : disabled ? /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } }) : null) : null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
       open,
-      onClose: closeDrawer,
+      onClose: () => {
+        closeDrawer(true);
+      },
       header: /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
         import_antd.Input,
         {
+          ref: searchRef,
           prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
           style: { marginTop: 16, height: 44 },
           placeholder: import_utils2.locales.getText("pisell2.text.search"),
@@ -289,7 +322,8 @@ var CustomSelect = (props, ref) => {
             ),
             onClick: () => {
               handleSelectItem(item);
-            }
+            },
+            id: item[rowKey]
           },
           item.loading ? /* @__PURE__ */ import_react.default.createElement(
             import_antd.Skeleton,
@@ -304,7 +338,7 @@ var CustomSelect = (props, ref) => {
             import_antd.Checkbox,
             {
               className: "custom-select-checkbox",
-              checked: (0, import_utils.getItemByArray)(_value, item, "form_record_id")
+              checked: (0, import_utils.getItemByArray)(_value, item, rowKey)
             }
           ), optionRender(item))
         )

package/lib/components/booking/components/customSelect/index.less

@@ -83,7 +83,6 @@
   justify-content: center;
   gap: 8px;
   padding: 16px;
-  border-bottom: 1px solid #D0D5DD;
   cursor: pointer;
 
   .pisell-lowcode__custom-select-create-icon {

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

@@ -1,8 +1,11 @@
 import React from "react";
 import { DrawerProps } from "antd";
 import "./index.less";
-interface PisellDrawerProps extends DrawerProps {
+export interface PisellDrawerProps extends DrawerProps {
     header?: React.ReactNode;
+    titleNoWrap?: boolean;
+    hideScrollBar?: boolean;
+    showGoBack?: boolean;
 }
 /**
  * @title: 自定义抽屉

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

@@ -36,7 +36,9 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_ArrowLeft = __toESM(require("@pisell/icon/es/ArrowLeft"));
 var import_index = require("./index.less");
+var import_classnames = __toESM(require("classnames"));
 var Drawer = (props) => {
+  const { hideScrollBar = true, showGoBack = true } = props;
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Drawer,
     {
@@ -44,12 +46,15 @@ var Drawer = (props) => {
       closable: false,
       zIndex: 999,
       ...props,
+      className: (0, import_classnames.default)("pisell-lowcode__booking-drawer", props.className, {
+        "pisell-lowcode__booking-drawer-hide-scrollbar": hideScrollBar
+      }),
       title: false,
       bodyStyle: { padding: 0 },
       push: false,
       mask: false
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-drawer-title-wrap" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__booking-drawer-title-wrap") }, showGoBack && /* @__PURE__ */ import_react.default.createElement(
       import_ArrowLeft.default,
       {
         className: "pisell-lowcode__booking-drawer-back",
@@ -58,7 +63,15 @@ var Drawer = (props) => {
           (_a = props.onClose) == null ? void 0 : _a.call(props, e);
         }
       }
-    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-drawer-title" }, props.title), props.header),
+    ), /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: (0, import_classnames.default)("pisell-lowcode__booking-drawer-title", {
+          "pisell-lowcode__booking-drawer-title-no-wrap": props.titleNoWrap
+        })
+      },
+      props.title
+    ), props.header),
     /* @__PURE__ */ import_react.default.createElement("div", null, props.children)
   );
 };

package/lib/components/booking/components/drawer/index.less

@@ -8,6 +8,8 @@
   z-index: 2;
   padding: 24px 32px 0 32px;
 
+
+
   .pisell-lowcode__booking-drawer-back {
     font-size: 32px;
     color: #000000;
@@ -26,8 +28,19 @@
   }
 }
 
-.pisell-lowcode-drawer-body {
-  &::-webkit-scrollbar {
-    display: block;
+
+.pisell-lowcode__booking-drawer-hide-scrollbar {
+  &.pisell-lowcode-drawer-body {
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+
   }
+}
+
+
+
+.pisell-lowcode__booking-drawer-title-no-wrap {
+  display: inline;
 }

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

@@ -1,4 +1,4 @@
 import React from "react";
 import "./index.less";
-declare const FooterMenus: ({ state, dispatch }: any) => React.JSX.Element | null;
+declare const FooterMenus: ({ state, menuChange, items }: any) => React.JSX.Element | null;
 export default FooterMenus;

package/lib/components/booking/components/footer/FooterMenus/index.js

@@ -35,27 +35,7 @@ module.exports = __toCommonJS(FooterMenus_exports);
 var import_react = __toESM(require("react"));
 var import_menuButton = __toESM(require("../../../components/menuButton"));
 var import_index = require("./index.less");
-var import_utils = require("@pisell/utils");
-var FooterMenus = ({ state, dispatch }) => {
-  const items = (0, import_react.useMemo)(() => {
-    let list = [];
-    if (state.bookingId) {
-      list.push({
-        label: import_utils.locales.getText("pisell2.text.rebook"),
-        key: "rebook"
-      });
-    }
-    return list;
-  }, [state]);
-  const handleRebook = () => {
-    var _a;
-    (_a = state.onRebook) == null ? void 0 : _a.call(state);
-  };
-  const menuChange = (e) => {
-    if (e.key === "rebook") {
-      handleRebook();
-    }
-  };
+var FooterMenus = ({ state, menuChange, items }) => {
   return items.length ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-buttons-item-rebook" }, /* @__PURE__ */ import_react.default.createElement(
     import_menuButton.default,
     {
@@ -63,6 +43,9 @@ var FooterMenus = ({ state, dispatch }) => {
       dropdownProps: {
         placement: "bottomLeft",
         menu: {
+          style: {
+            minWidth: 200
+          },
           items,
           onClick: menuChange
         }

package/lib/components/booking/components/footer/amount.d.ts

@@ -19,4 +19,5 @@ export declare const getSumTotal: (state: any, isEdit: boolean) => {
     orderPaidAmount: number;
     totalRefundAmount: number;
     dueAmount: number;
+    roundingAmount: number;
 };

package/lib/components/booking/components/footer/amount.js

@@ -25,6 +25,15 @@ __export(amount_exports, {
 module.exports = __toCommonJS(amount_exports);
 var import_utils = require("../../utils");
 var import_utils2 = require("@pisell/utils");
+var getRelationDetailsTotal = (relation_details) => {
+  let total = 0;
+  for (let item of relation_details) {
+    const number = item.product_quantity || item.num;
+    const price = item.payment_price || item.price;
+    total += Number(price) * Number(number);
+  }
+  return total;
+};
 var getProductAmount = (state, isEdit) => {
   var _a, _b;
   let price = 0;
@@ -32,11 +41,12 @@ var getProductAmount = (state, isEdit) => {
   if (isEdit) {
     if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
       for (let item of state == null ? void 0 : state.service.value) {
-        price += Number(item._extend.price) * (item._extend.quantity || 1);
+        price += Number(item._extend.total);
+        price += getRelationDetailsTotal(item._extend.relation_details || []);
         duration += import_utils.flexibleObj.getValue(item._extend.duration);
       }
       for (let item of state.addons.value) {
-        price += Number(item.price) * item.quantity;
+        price += Number(item._extend.total) * item._extend.quantity;
       }
     }
   } else {
@@ -53,7 +63,7 @@ var getProductAmount = (state, isEdit) => {
 };
 var getProductItemTax = (item, bookingDetail) => {
   let price = 0;
-  const productDiscountPrice = Number(item.price);
+  const productDiscountPrice = Number(item.total);
   const shopTax = productDiscountPrice * Number(bookingDetail.tax_rate) * Number(item.is_charge_tax);
   const shopTaxRate = 1 + bookingDetail.tax_rate * bookingDetail.is_price_include_tax;
   const res = shopTax / shopTaxRate * item.quantity;
@@ -61,10 +71,7 @@ var getProductItemTax = (item, bookingDetail) => {
   return price;
 };
 var getTotal = (item) => {
-  return item._extend.payment_price !== void 0 ? item._extend.payment_price : item._extend.price;
-};
-var getAddonsTotal = (item) => {
-  return item.payment_price !== void 0 ? item.payment_price : item.price;
+  return item._extend.payment_price !== void 0 ? item._extend.payment_price : item._extend.total;
 };
 var getTax = (state, isEdit) => {
   var _a;
@@ -80,7 +87,8 @@ var getTax = (state, isEdit) => {
       price += getProductItemTax(
         {
           ...item,
-          price: getTotal(item),
+          total: getTotal(item),
+          price: item._extend.price,
           quantity: item._extend.quantity
         },
         state.bookingDetail
@@ -89,8 +97,9 @@ var getTax = (state, isEdit) => {
     for (let item of state.addons.value) {
       price += getProductItemTax({
         ...item,
-        price: getAddonsTotal(item),
-        quantity: item.quantity
+        total: getTotal(item),
+        price: item._extend.price,
+        quantity: item._extend.quantity
       }, state.bookingDetail);
     }
   }
@@ -145,8 +154,16 @@ var getShopDiscount = (state) => {
   var _a;
   return Number((_a = state.bookingDetail) == null ? void 0 : _a.shop_discount) || 0;
 };
+var getRoundingAmount = (state) => {
+  var _a;
+  return Number((_a = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a.rounding_amount) || 0;
+};
+var getSumTotalAmount = ({ expectAmount, roundingAmount }) => {
+  return expectAmount + roundingAmount;
+};
 var getSumTotal = (state, isEdit) => {
   const { price, duration } = getProductAmount(state, isEdit);
+  const roundingAmount = getRoundingAmount(state);
   const tax = getTax(state, isEdit);
   const paySurchargeFee = getPaySurchargeFee(state);
   const otherAmount = getOtherAmount(state);
@@ -155,7 +172,7 @@ var getSumTotal = (state, isEdit) => {
   const totalRefundAmount = getTotalRefundAmount(state);
   const shopDiscount = getShopDiscount(state);
   const expectAmount = getExpectAmount({ price, tax, otherAmount, shopDiscount, state, isEdit });
-  const sumTotalAmount = expectAmount;
+  const sumTotalAmount = getSumTotalAmount({ expectAmount, roundingAmount });
   const notPaidAmount = Number((0, import_utils2.formatAmount)(sumTotalAmount, 2, "")) - orderPaidAmount;
   const actualPaidAmount = paidAmount;
   const dueAmount = notPaidAmount < 0 ? Number((0, import_utils2.formatAmount)(notPaidAmount + totalRefundAmount, 2, "")) : 0;
@@ -174,7 +191,8 @@ var getSumTotal = (state, isEdit) => {
     actualPaidAmount,
     orderPaidAmount,
     totalRefundAmount,
-    dueAmount
+    dueAmount,
+    roundingAmount
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,5 +1,5 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 /**
  * @title: 底部
  * @description: