@pisell/private-materials 3.0.78 → 3.0.80

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

@@ -1,4 +1,13 @@
 import React from "react";
 import "./index.less";
-declare const Pet: () => React.JSX.Element;
+import { InfoProps } from "../../forms/forms";
+interface PetProps {
+    state?: any;
+    dispatch?: any;
+    hideTitle?: boolean;
+    addButtonProps?: InfoProps['addButtonProps'];
+    handleOpenModal?: () => void;
+    clientChangeNotSetPet?: boolean;
+}
+declare const Pet: (props: PetProps) => React.JSX.Element;
 export default Pet;

package/es/components/booking/info/pet/index.js

@@ -34,8 +34,12 @@ var defaultParams = {
   total: 0,
   keyword: ""
 };
-var Pet = function Pet() {
-  var _context$appHelper, _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$bookingConfig6, _state$client$value2, _state$client8, _state$client8$value, _state$pet5, _state$pet5$formData, _state$pet5$formData$, _state$pet5$formData$2, _state$client9;
+var Pet = function Pet(props) {
+  var _context$appHelper, _state2, _state2$bookingConfig, _state2$bookingConfig2, _state2$bookingConfig3, _state$bookingConfig3, _state$client$value2, _state$client8, _state$client8$value, _state$pet5, _state$pet5$formData, _state$pet5$formData$, _state$pet5$formData$2, _state$client9;
+  var hideTitle = props.hideTitle,
+    addButtonProps = props.addButtonProps,
+    handleOpenModal = props.handleOpenModal,
+    clientChangeNotSetPet = props.clientChangeNotSetPet;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loadLoading = _useState2[0],
@@ -58,11 +62,13 @@ var Pet = function Pet() {
     _useState8 = _slicedToArray(_useState7, 2),
     params = _useState8[0],
     setParams = _useState8[1];
+  state = state || (props === null || props === void 0 ? void 0 : props.state);
+  dispatch = dispatch || (props === null || props === void 0 ? void 0 : props.dispatch);
   // board设置, 获取预约主体
   var boardParams = useMemo(function () {
-    var _state$bookingConfig, _state$bookingConfig$, _state$bookingConfig$2;
-    return (state === null || state === void 0 ? void 0 : (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 ? void 0 : (_state$bookingConfig$ = _state$bookingConfig.config) === null || _state$bookingConfig$ === void 0 ? void 0 : (_state$bookingConfig$2 = _state$bookingConfig$.basic) === null || _state$bookingConfig$2 === void 0 ? void 0 : _state$bookingConfig$2.appointment_subject) || {};
-  }, [state === null || state === void 0 ? void 0 : (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 ? void 0 : (_state$bookingConfig3 = _state$bookingConfig2.config) === null || _state$bookingConfig3 === void 0 ? void 0 : (_state$bookingConfig4 = _state$bookingConfig3.basic) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.appointment_subject]);
+    var _state, _state$bookingConfig, _state$bookingConfig$, _state$bookingConfig$2;
+    return ((_state = state) === null || _state === void 0 ? void 0 : (_state$bookingConfig = _state.bookingConfig) === null || _state$bookingConfig === void 0 ? void 0 : (_state$bookingConfig$ = _state$bookingConfig.config) === null || _state$bookingConfig$ === void 0 ? void 0 : (_state$bookingConfig$2 = _state$bookingConfig$.basic) === null || _state$bookingConfig$2 === void 0 ? void 0 : _state$bookingConfig$2.appointment_subject) || {};
+  }, [(_state2 = state) === null || _state2 === void 0 ? void 0 : (_state2$bookingConfig = _state2.bookingConfig) === null || _state2$bookingConfig === void 0 ? void 0 : (_state2$bookingConfig2 = _state2$bookingConfig.config) === null || _state2$bookingConfig2 === void 0 ? void 0 : (_state2$bookingConfig3 = _state2$bookingConfig2.basic) === null || _state2$bookingConfig3 === void 0 ? void 0 : _state2$bookingConfig3.appointment_subject]);
 
   /**
    * @title: 预约主体
@@ -73,8 +79,8 @@ var Pet = function Pet() {
    * @Date: 2024-01-27 14:22
    */
   var petForm = useMemo(function () {
-    var _state$bookingConfig5;
-    var _holder = (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.holder;
+    var _state$bookingConfig2;
+    var _holder = (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.holder;
     if (!_holder) {
       return null;
     }
@@ -85,7 +91,7 @@ var Pet = function Pet() {
       relation_type: "appointment_booking",
       form_record: []
     });
-  }, [(_state$bookingConfig6 = state.bookingConfig) === null || _state$bookingConfig6 === void 0 ? void 0 : _state$bookingConfig6.holder]);
+  }, [(_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.holder]);
 
   /**
    * @title: 获取表单数据
@@ -345,6 +351,7 @@ var Pet = function Pet() {
   // 当客户id 发生改变时, 检测当前表单是否是该客户的, 如果不是则移除
   useEffect(function () {
     var _state$pet, _state$client7, _state$client7$value, _state$pet2;
+    if (clientChangeNotSetPet) return;
     var changeFormValuesData = changeFormValues({
       values: ((_state$pet = state.pet) === null || _state$pet === void 0 ? void 0 : _state$pet.value) || {},
       clientId: (_state$client7 = state.client) === null || _state$client7 === void 0 ? void 0 : (_state$client7$value = _state$client7.value) === null || _state$client7$value === void 0 ? void 0 : _state$client7$value.id,
@@ -358,7 +365,7 @@ var Pet = function Pet() {
         }
       });
     });
-  }, [(_state$client$value2 = state.client.value) === null || _state$client$value2 === void 0 ? void 0 : _state$client$value2.id]);
+  }, [(_state$client$value2 = state.client.value) === null || _state$client$value2 === void 0 ? void 0 : _state$client$value2.id, clientChangeNotSetPet]);
   var handleUpdateForm = function handleUpdateForm() {
     if (state.bookingId) {
       // 编辑时 必须获取详情后在获取预约主体信息
@@ -376,7 +383,7 @@ var Pet = function Pet() {
     setTimeout(function () {
       handleUpdateForm();
     }, 10);
-  }, [state.bookingId, state.bookingDetail, boardParams.form_id, boardParams.type, (_state$client8 = state.client) === null || _state$client8 === void 0 ? void 0 : (_state$client8$value = _state$client8.value) === null || _state$client8$value === void 0 ? void 0 : _state$client8$value.id, state.renderType, petForm]);
+  }, [state.bookingId, state.bookingDetail, boardParams.form_id, boardParams.type, state.renderType, petForm, clientChangeNotSetPet ? (_state$client8 = state.client) === null || _state$client8 === void 0 ? void 0 : (_state$client8$value = _state$client8.value) === null || _state$client8$value === void 0 ? void 0 : _state$client8$value.id : undefined]);
   var _addCallback = function addCallback(_params) {
     var _state$pet3, _state$pet3$formData;
     var _formData = (_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : (_state$pet3$formData = _state$pet3.formData) === null || _state$pet3$formData === void 0 ? void 0 : _state$pet3$formData[0];
@@ -420,7 +427,7 @@ var Pet = function Pet() {
     active: true,
     round: true
   }, /*#__PURE__*/React.createElement(FormsCom, {
-    hideTitle: true,
+    hideTitle: hideTitle,
     watch: {
       value: state.pet.value
     },
@@ -449,7 +456,8 @@ var Pet = function Pet() {
       loadMore: loadMore,
       filterItem: function filterItem() {
         return true;
-      }
+      },
+      handleOpenModal: handleOpenModal
     },
     optionRender: function optionRender(item) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Avatar, {
@@ -484,7 +492,7 @@ var Pet = function Pet() {
         }
       }, locales.getText("pisell2.text.edit"))));
     },
-    addButtonProps: {
+    addButtonProps: _objectSpread({
       style: {
         margin: 0
       },
@@ -507,7 +515,7 @@ var Pet = function Pet() {
         }
         return addCallback;
       }()
-    }
+    }, addButtonProps)
   })));
 };
 export default Pet;

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

@@ -282,7 +282,7 @@ var Info = function Info() {
     var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _state$service4, _state$service4$value;
     // Salonip 不要这个
 
-    if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.global) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id)) {
+    if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.global) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) || state.closeAutoOpenService) {
       return;
     }
 

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

@@ -1 +1,2 @@
 export declare const getIsBundleOrCombination: (productDetail: any) => boolean;
+export declare const uniqueByField: (arr: any[], field: string) => any[];

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

@@ -5,4 +5,16 @@ export var getIsBundleOrCombination = function getIsBundleOrCombination(productD
     return true;
   }
   return false;
+};
+export var uniqueByField = function uniqueByField(arr, field) {
+  var seen = new Set();
+  return arr.filter(function (item) {
+    var fieldValue = item[field];
+    if (seen.has(fieldValue)) {
+      return false;
+    } else {
+      seen.add(fieldValue);
+      return true;
+    }
+  });
 };

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

@@ -157,6 +157,8 @@ declare const _default: {
         'page.booking.text.fully-booked': string;
         'page.booking.text.unlimited': string;
         'pisell2.text.terminal-edit-message': string;
+        "pisell2.text.actions": string;
+        "pisell2.text.add-client": string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -316,6 +318,8 @@ declare const _default: {
         'page.booking.text.available': string;
         'page.booking.text.fully-booked': string;
         'page.booking.text.unlimited': string;
+        "pisell2.text.actions": string;
+        "pisell2.text.add-client": string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -475,6 +479,8 @@ declare const _default: {
         'page.booking.text.available': string;
         'page.booking.text.fully-booked': string;
         'page.booking.text.unlimited': string;
+        "pisell2.text.actions": string;
+        "pisell2.text.add-client": string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -171,7 +171,9 @@ export default {
     'page.booking.text.available': 'Available',
     'page.booking.text.fully-booked': 'Fully booked',
     'page.booking.text.unlimited': 'Unlimited',
-    'pisell2.text.terminal-edit-message': "This operation cannot be performed. To proceed, please use the Pisell Terminal."
+    'pisell2.text.terminal-edit-message': "This operation cannot be performed. To proceed, please use the Pisell Terminal.",
+    "pisell2.text.actions": "Actions",
+    "pisell2.text.add-client": "Add customer"
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -350,7 +352,9 @@ export default {
     'page.booking.text.unavailable': '不可用',
     'page.booking.text.available': '可用',
     'page.booking.text.fully-booked': '已约满',
-    'page.booking.text.unlimited': '无限制'
+    'page.booking.text.unlimited': '无限制',
+    "pisell2.text.actions": "操作选项",
+    "pisell2.text.add-client": "添加客户"
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -529,6 +533,8 @@ export default {
     'page.booking.text.unavailable': '不可用',
     'page.booking.text.available': '可用',
     'page.booking.text.fully-booked': '已約滿',
-    'page.booking.text.unlimited': '無限制'
+    'page.booking.text.unlimited': '無限制',
+    "pisell2.text.actions": "操作選項",
+    "pisell2.text.add-client": "添加客戶"
   }
 };

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

@@ -89,6 +89,8 @@ export interface FormState {
         productIds: number[];
     };
     disableEventBookingEdit?: boolean;
+    /** 关闭自动打开选择服务弹窗 */
+    closeAutoOpenService?: boolean;
 }
 export declare const walkInData: {
     id: number;

package/es/index.d.ts

@@ -11,6 +11,7 @@ export { default as BookingResources } from './components/booking/materiels/reso
 export { default as BookingStartTime } from './components/booking/materiels/startTime';
 export { default as BookingDuration } from './components/booking/materiels/duration';
 export { default as BookingContacts } from './components/booking/materiels/contacts';
+export { VerticalClient } from './components/booking/info/clientVariant';
 export { default as ProductExtension } from './components/productExtension';
 export { default as BookingDeposit } from './components/booking/deposit';
 export { default as RuleSetting } from './components/ruleSetting';

package/es/index.js

@@ -15,6 +15,7 @@ export { default as BookingResources } from "./components/booking/materiels/reso
 export { default as BookingStartTime } from "./components/booking/materiels/startTime";
 export { default as BookingDuration } from "./components/booking/materiels/duration";
 export { default as BookingContacts } from "./components/booking/materiels/contacts";
+export { VerticalClient } from "./components/booking/info/clientVariant";
 export { default as ProductExtension } from "./components/productExtension";
 export { default as BookingDeposit } from "./components/booking/deposit";
 export { default as RuleSetting } from "./components/ruleSetting";

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

@@ -68,7 +68,7 @@ var AddButton = ({
     {
       className: "pisell-lowcode__booking-add-button-add-row",
       onClick: _onClick,
-      style
+      style: (0, import_utils.isFunction)(style) ? style(showSub) : style
     },
     /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__booking-add-button-add-row-icon" }),
     /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-add-button-add-row-txt" }, subTitle)
@@ -79,7 +79,7 @@ var AddButton = ({
         "pisell-lowcode__booking-add-button-add-disabled": disabled
       }),
       onClick: _onClick,
-      style
+      style: (0, import_utils.isFunction)(style) ? style(showSub) : style
     },
     /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-add-button-add-label" }, title),
     /* @__PURE__ */ import_react.default.createElement(import_ChevronRight.default, { className: "pisell-lowcode__booking-add-button-add-icon" })

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

@@ -29,6 +29,8 @@ interface CustomSelectProps {
     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

@@ -73,7 +73,8 @@ var CustomSelect = (props, ref) => {
     modalOpen,
     closeCallback,
     autoFocus,
-    showDropDown = true
+    showDropDown = true,
+    handleOpenModal: propsHandleOpenModal
   } = props;
   const searchRef = (0, import_react.useRef)();
   const [_value, set_value] = (0, import_react.useState)([]);
@@ -110,6 +111,10 @@ var CustomSelect = (props, ref) => {
     if (disabled) {
       return;
     }
+    if (propsHandleOpenModal) {
+      propsHandleOpenModal();
+      return;
+    }
     if (addButtonProps == null ? void 0 : addButtonProps.addCallback) {
       addButtonProps == null ? void 0 : addButtonProps.addCallback();
     }

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

@@ -5,6 +5,7 @@ export interface PisellDrawerProps extends DrawerProps {
     header?: React.ReactNode;
     titleNoWrap?: boolean;
     hideScrollBar?: boolean;
+    showGoBack?: boolean;
 }
 /**
  * @title: 自定义抽屉

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

@@ -38,7 +38,7 @@ 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 } = props;
+  const { hideScrollBar = true, showGoBack = true } = props;
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Drawer,
     {
@@ -54,7 +54,7 @@ var Drawer = (props) => {
       push: false,
       mask: false
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("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",

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

@@ -330,7 +330,6 @@ var Footer = (props) => {
       customer = (res == null ? void 0 : res.customer_id) ? { id: res == null ? void 0 : res.customer_id } : state.bookingDetail.customer;
     }
     if (e.key === "sendMail") {
-      console.log(e);
       state.action({
         type: "pisell1.sendPayLinkEmail",
         data: {

package/lib/components/booking/info/client/index.js

@@ -276,7 +276,8 @@ var Info = () => {
           return;
         }
         handleOpenClientModal();
-      }
+      },
+      style: state.bookingId ? {} : { marginTop: 16 }
     },
     /* @__PURE__ */ import_react.default.createElement(
       import_antd.Avatar,

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -0,0 +1,39 @@
+import React from "react";
+import { FormState } from "../../../model";
+interface useClientFnParams {
+    state: any;
+    setGlobalState: (val: any) => void;
+    modalRef: any;
+}
+declare const useClientFn: (_params: useClientFnParams) => {
+    setClient: (client: Partial<FormState["client"]>) => void;
+    isWalkIn: boolean;
+    handleSelectClient: (value: any) => Promise<unknown>;
+    menuChange: (e: any) => void;
+    handleViewClient: () => void;
+    menus: {
+        key: string;
+        label: any;
+    }[];
+    handleCreateItem: () => void;
+    getClients: ({ customer_id, ...resetParams }: {
+        customer_id?: number | undefined;
+        skip?: number | undefined;
+        search?: string | undefined;
+        with?: string[] | undefined;
+        relation_form_id?: number | undefined;
+    }) => Promise<{}>;
+    params: {
+        skip: number;
+        num: number;
+        total: number;
+        search: string;
+        with: string[];
+        relation_form_id: any;
+    };
+    searchChange: (search: string) => void;
+    loading: boolean;
+    loadMore: React.JSX.Element | null;
+    handleOpenClientModal: () => void;
+};
+export default useClientFn;