@pisell/private-materials 3.0.83 → 3.0.84

package/es/components/booking/info/clientVariant/vertical/index.js

@@ -0,0 +1,247 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import React, { useEffect, useMemo, useRef } from 'react';
+import User01 from '@pisell/icon/es/User01';
+import { Avatar, Button, Dropdown, Skeleton, Space } from 'antd';
+import { image, locales } from '@pisell/utils';
+import { DownOutlined, PlusOutlined } from '@ant-design/icons';
+import useClientFn from "../hooks/useClientFn";
+import SelectDrawer from "./SelectDrawer";
+import Pet from "../../pet";
+import "./index.less";
+import useEngineContext from "../../../../../hooks/useEngineContext";
+var VerticalClient = function VerticalClient(props) {
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig8, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$pet3, _state$pet4, _state$client$value, _state$client$value2, _state$client$value3, _state$client$value4, _state$client$value5, _state$pet5, _state$pet5$value, _context$appHelper, _context$appHelper$ut, _context$appHelper$ut2, _state$bookingConfig12, _state$client;
+  var globalState = props.globalState,
+    setGlobalState = props.setGlobalState;
+  var modalRef = useRef();
+  var state = globalState;
+  var stateRef = useRef(state);
+  var prevCustomerId = useRef(null);
+  var context = useEngineContext();
+  stateRef.current = state;
+  var _useClientFn = useClientFn({
+      state: state,
+      setGlobalState: setGlobalState,
+      modalRef: modalRef
+    }),
+    isWalkIn = _useClientFn.isWalkIn,
+    setClient = _useClientFn.setClient,
+    handleSelectClient = _useClientFn.handleSelectClient,
+    menuChange = _useClientFn.menuChange,
+    handleViewClient = _useClientFn.handleViewClient,
+    menus = _useClientFn.menus,
+    handleCreateItem = _useClientFn.handleCreateItem,
+    getClients = _useClientFn.getClients,
+    params = _useClientFn.params,
+    searchChange = _useClientFn.searchChange,
+    loading = _useClientFn.loading,
+    loadMore = _useClientFn.loadMore,
+    handleOpenClientModal = _useClientFn.handleOpenClientModal,
+    getNickname = _useClientFn.getNickname;
+  var renderList = useMemo(function () {
+    var _list = _toConsumableArray(state.client.clients);
+    return _list;
+  }, [state.client.clients]);
+  var handleClose = function handleClose() {
+    setTimeout(function () {
+      setClient({
+        showModal: false
+      });
+    });
+  };
+  var petDispatch = function petDispatch(_ref) {
+    var type = _ref.type,
+      payload = _ref.payload;
+    if (type === 'setPet') {
+      setGlobalState({
+        pet: _objectSpread(_objectSpread({}, stateRef.current.pet), payload)
+      });
+    }
+  };
+  var boardConfig = 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$bookingConfig3.basic]);
+  useEffect(function () {
+    var _state$bookingConfig4, _state$bookingConfig5, _state$bookingConfig6, _state$bookingConfig7;
+    if ((state === null || state === void 0 ? void 0 : (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 ? void 0 : (_state$bookingConfig5 = _state$bookingConfig4.config) === null || _state$bookingConfig5 === void 0 ? void 0 : (_state$bookingConfig6 = _state$bookingConfig5.basic) === null || _state$bookingConfig6 === void 0 ? void 0 : (_state$bookingConfig7 = _state$bookingConfig6.appointment_customer) === null || _state$bookingConfig7 === void 0 ? void 0 : _state$bookingConfig7.type) === 'customer' && state !== null && state !== void 0 && state.modalOpen && !(state !== null && state !== void 0 && state.bookingId)) {
+      handleOpenClientModal();
+    } else {
+      modalRef.current.close();
+      setClient({
+        showModal: false
+      });
+    }
+  }, [state === null || state === void 0 ? void 0 : (_state$bookingConfig8 = state.bookingConfig) === null || _state$bookingConfig8 === void 0 ? void 0 : (_state$bookingConfig9 = _state$bookingConfig8.config) === null || _state$bookingConfig9 === void 0 ? void 0 : (_state$bookingConfig10 = _state$bookingConfig9.basic) === null || _state$bookingConfig10 === void 0 ? void 0 : (_state$bookingConfig11 = _state$bookingConfig10.appointment_customer) === null || _state$bookingConfig11 === void 0 ? void 0 : _state$bookingConfig11.type, state === null || state === void 0 ? void 0 : state.modalOpen]);
+  var handleSelectPet = function handleSelectPet(val) {
+    setGlobalState({
+      pet: _objectSpread(_objectSpread({}, state.pet), {}, {
+        edit: true,
+        value: val
+      })
+    });
+  };
+  var handleOpenModal = function handleOpenModal() {
+    handleOpenClientModal();
+  };
+  var handleAddPet = function handleAddPet(_client) {
+    var _state$pet$formData;
+    var _data = {
+      formDataConfig: _objectSpread({}, ((_state$pet$formData = state.pet.formData) === null || _state$pet$formData === void 0 ? void 0 : _state$pet$formData[0]) || {})
+    };
+    _data.customerId = _client.id;
+    state.action({
+      type: 'pisell1.goCustomFormAddData',
+      data: _data,
+      callback: function callback(res) {
+        var newClients = stateRef.current.client.clients.map(function (item) {
+          if (item.id === _client.id) {
+            var newFormRecordObj = res.reduce(function (p, c) {
+              return _objectSpread(_objectSpread({}, p), {}, _defineProperty({}, c.key, c.value));
+            }, {});
+            return _objectSpread(_objectSpread({}, item), {}, {
+              form_record: [].concat(_toConsumableArray(item.form_record), [_objectSpread(_objectSpread({}, newFormRecordObj), {}, {
+                id: newFormRecordObj.form_record_id,
+                data: newFormRecordObj
+              })])
+            });
+          }
+          return item;
+        });
+        setClient({
+          clients: newClients
+        });
+        // getClients(params);
+      }
+    });
+  };
+
+  var previewItemTitleRender = function previewItemTitleRender(value, index, values) {
+    var _value$customer, _value$customer2, _value$customer3, _value$customer4, _state$pet$formData2, _state$pet$formData2$;
+    var title = getNickname(value.customer) || (value === null || value === void 0 ? void 0 : (_value$customer = value.customer) === null || _value$customer === void 0 ? void 0 : _value$customer.email) || (value === null || value === void 0 ? void 0 : (_value$customer2 = value.customer) === null || _value$customer2 === void 0 ? void 0 : _value$customer2.phone) || '';
+    if ((value === null || value === void 0 ? void 0 : (_value$customer3 = value.customer) === null || _value$customer3 === void 0 ? void 0 : _value$customer3.id) === prevCustomerId.current) {
+      if (values.length === index + 1) {
+        prevCustomerId.current = null;
+      }
+      return null;
+    }
+    prevCustomerId.current = value === null || value === void 0 ? void 0 : (_value$customer4 = value.customer) === null || _value$customer4 === void 0 ? void 0 : _value$customer4.id;
+    if (values.length === index + 1) {
+      prevCustomerId.current = null;
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      className: "pisell-lowcode__booking-pet-title"
+    }, title, " ' ", ((_state$pet$formData2 = state.pet.formData) === null || _state$pet$formData2 === void 0 ? void 0 : (_state$pet$formData2$ = _state$pet$formData2[0]) === null || _state$pet$formData2$ === void 0 ? void 0 : _state$pet$formData2$.title) || '');
+  };
+  var isShowAddBtn = useMemo(function () {
+    var _state$pet, _state$pet$formData3, _state$pet$formData3$, _state$pet2, _state$pet2$value, _state$pet2$value$for;
+    var formId = (_state$pet = state.pet) === null || _state$pet === void 0 ? void 0 : (_state$pet$formData3 = _state$pet.formData) === null || _state$pet$formData3 === void 0 ? void 0 : (_state$pet$formData3$ = _state$pet$formData3[0]) === null || _state$pet$formData3$ === void 0 ? void 0 : _state$pet$formData3$.form_id;
+    if ((!isWalkIn || (_state$pet2 = state.pet) !== null && _state$pet2 !== void 0 && (_state$pet2$value = _state$pet2.value) !== null && _state$pet2$value !== void 0 && (_state$pet2$value$for = _state$pet2$value[formId]) !== null && _state$pet2$value$for !== void 0 && _state$pet2$value$for.length) && !(state !== null && state !== void 0 && state.disabledEdit) && boardConfig.type === 'form') {
+      return true;
+    }
+    return false;
+  }, [isWalkIn, state === null || state === void 0 ? void 0 : state.disabledEdit, (_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.value, (_state$pet4 = state.pet) === null || _state$pet4 === void 0 ? void 0 : _state$pet4.formData, boardConfig.type]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-vertical-client-wrap"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-vertical-client",
+    onClick: function onClick() {
+      if (!isWalkIn || state !== null && state !== void 0 && state.disableEventBookingEdit) {
+        return;
+      }
+      handleOpenClientModal();
+    }
+  }, /*#__PURE__*/React.createElement(Skeleton, {
+    loading: state.loading,
+    active: true,
+    round: true
+  }, /*#__PURE__*/React.createElement(Avatar, {
+    className: "pisell-lowcode__booking-client-avatar",
+    src: image.ali((_state$client$value = state.client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.cover, 100),
+    size: 64,
+    icon: /*#__PURE__*/React.createElement(User01, {
+      className: "pisell-lowcode__booking-client-list-item-avatar-icon"
+    })
+  }), isWalkIn ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-client-info-desc"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-client-title"
+  }, locales.getText('pisell2.text.add-client')), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-client-desc-item"
+  }, locales.getText('pisell2.text.leave-empty-for-walk-in'))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-client-title"
+  }, getNickname(state.client.value)), (_state$client$value2 = state.client.value) !== null && _state$client$value2 !== void 0 && _state$client$value2.email ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-client-desc-item"
+  }, (_state$client$value3 = state.client.value) === null || _state$client$value3 === void 0 ? void 0 : _state$client$value3.email) : null, (_state$client$value4 = state.client.value) !== null && _state$client$value4 !== void 0 && _state$client$value4.phone ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-client-desc-item"
+  }, (_state$client$value5 = state.client.value) === null || _state$client$value5 === void 0 ? void 0 : _state$client$value5.phone) : null), !isWalkIn && /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-client-action-wrap"
+  }, !state.disabledEdit && /*#__PURE__*/React.createElement(Dropdown, {
+    menu: {
+      items: menus,
+      onClick: menuChange
+    },
+    placement: "bottomRight"
+  }, /*#__PURE__*/React.createElement(Button, {
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    }
+  }, /*#__PURE__*/React.createElement(Space, null, locales.getText('pisell2.text.actions'), /*#__PURE__*/React.createElement(DownOutlined, null)))), /*#__PURE__*/React.createElement(Button, {
+    onClick: function onClick(e) {
+      e.stopPropagation();
+      handleViewClient();
+    }
+  }, locales.getText('pisell2.text.view-profile'))))), /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-vertical-pet"
+  }, !(state !== null && state !== void 0 && state.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, boardConfig.type === 'form' ? /*#__PURE__*/React.createElement(Pet, {
+    clientChangeNotSetPet: true,
+    state: state,
+    dispatch: petDispatch,
+    hideTitle: !((_state$pet5 = state.pet) !== null && _state$pet5 !== void 0 && (_state$pet5$value = _state$pet5.value) !== null && _state$pet5$value !== void 0 && _state$pet5$value.length),
+    handleOpenModal: handleOpenModal,
+    addButtonProps: {
+      onClick: handleOpenClientModal,
+      style: {
+        display: 'none'
+      }
+    },
+    previewItemTitleRender: previewItemTitleRender
+  }) : null) : null), isShowAddBtn && /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-vertical-footer"
+  }, /*#__PURE__*/React.createElement(Button, {
+    icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
+    onClick: handleOpenClientModal,
+    block: true,
+    size: "large"
+  }, locales.getText('pisell2.text.add'))), /*#__PURE__*/React.createElement(SelectDrawer, {
+    modalOpen: state.modalOpen,
+    loading: loading,
+    autoFocus: !(context !== null && context !== void 0 && (_context$appHelper = context.appHelper) !== null && _context$appHelper !== void 0 && (_context$appHelper$ut = _context$appHelper.utils) !== null && _context$appHelper$ut !== void 0 && (_context$appHelper$ut2 = _context$appHelper$ut.isTerminal) !== null && _context$appHelper$ut2 !== void 0 && _context$appHelper$ut2.call(_context$appHelper$ut)),
+    ref: modalRef,
+    onClose: handleClose,
+    handleSelectClient: handleSelectClient,
+    handleCreateItem: handleCreateItem,
+    childrenValue: state.pet.value,
+    handleSelectPet: handleSelectPet,
+    formData: state.pet.formData,
+    searchChange: searchChange,
+    options: renderList,
+    holder: state === null || state === void 0 ? void 0 : (_state$bookingConfig12 = state.bookingConfig) === null || _state$bookingConfig12 === void 0 ? void 0 : _state$bookingConfig12.holder,
+    client: state === null || state === void 0 ? void 0 : (_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value,
+    loadMore: loadMore,
+    showPet: (boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.type) === 'form',
+    handleAddPet: handleAddPet
+  }));
+};
+export default VerticalClient;

package/es/components/booking/info/clientVariant/vertical/index.less

@@ -0,0 +1,83 @@
+.pisell-lowcode__booking-vertical-client-wrap {
+  position: relative;
+  overflow: hidden;
+  height: 100%;
+  width: 100%;
+  border-right: 1px solid var(--Gray-200, #EAECF0);
+  background: var(--Gray-50, #F9FAFB);
+  display: flex;
+  flex-direction: column;
+  .pisell-lowcode-drawer-content {
+    border-right: 1px solid var(--Gray-200, #EAECF0);
+  }
+  .pisell-lowcode__booking-drawer-title-wrap {
+    padding: 24px 24px 0;
+  }
+  .pisell-lowcode__booking-drawer-back {
+    margin-right: 6px;
+  }
+  .pisell-lowcode__booking-drawer-back, .pisell-lowcode__booking-drawer-title {
+    font-size: 18px;
+  }
+}
+.pisell-lowcode__booking-vertical-client {
+  padding: 24px 16px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  border-bottom: 1px solid var(--Gray-200, #EAECF0);
+  .pisell-lowcode__booking-client-avatar {
+    margin-bottom: 16px;
+  }
+  .pisell-lowcode__booking-client-title {
+    color: var(--Gray-900, #101828);
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: 24px; /* 150% */
+    text-align: center;
+  }
+  .pisell-lowcode__booking-client-desc-item {
+    color: var(--Gray-400, #98A2B3);
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 20px; /* 142.857% */
+    text-align: center;
+    max-width: 200px;
+    word-break:break-word
+  }
+  .pisell-lowcode__booking-client-action-wrap {
+    display: flex;
+    gap: 16px;
+    justify-content: center;
+    margin-top: 16px;
+  }
+}
+
+.pisell-lowcode__booking-vertical-pet {
+  padding: 0 24px 24px;
+  flex:1;
+  overflow: auto;
+}
+.pisell-lowcode__booking-pet-title {
+  color: var(--Gray-700, #344054);
+  font-size: 14px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 20px;
+  margin-bottom: 8px;
+  word-break: break-word;
+}
+
+.pisell-lowcode__booking-vertical-footer {
+  display: flex;
+  padding: var(--rateStarSize, 20px) 32px;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 16px;
+  border-top: 1px solid var(--Gray-200, #EAECF0);
+  background: var(--Base-White, #FFF);
+  box-shadow: 0px -4px 8px -2px rgba(16, 24, 40, 0.10), 0px -2px 4px -2px rgba(16, 24, 40, 0.06);
+}

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

@@ -93,7 +93,7 @@ var Info = Provider(function (props) {
     }) : /*#__PURE__*/React.createElement("div", {
       className: "",
       style: {
-        height: 20
+        height: 0
       }
     });
   }, [globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, modal.state, modal.dispatch, globalState === null || globalState === void 0 ? void 0 : globalState.renderType]);

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

@@ -1,4 +1,14 @@
 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;
+    previewItemTitleRender?: (item: any, index: number, values: any[]) => React.ReactNode;
+}
+declare const Pet: (props: PetProps) => React.JSX.Element;
 export default Pet;

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

@@ -25,7 +25,7 @@ import { Avatar, Skeleton, Button } from "antd";
 import "./index.less";
 import { locales } from "@pisell/utils";
 import FormsCom from "../../forms/forms";
-import { changeFormValues } from "../../forms/format";
+import { changeFormValues, sortFormValues } from "../../forms/format";
 import { isWalkIn } from "../../utils";
 import useEngineContext from "../../../../hooks/useEngineContext";
 var defaultParams = {
@@ -34,8 +34,13 @@ 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$client9, _state$client9$value, _state$pet5, _state$pet5$formData, _state$pet5$formData$, _state$pet5$formData$2, _state$client10;
+  var hideTitle = props.hideTitle,
+    addButtonProps = props.addButtonProps,
+    handleOpenModal = props.handleOpenModal,
+    clientChangeNotSetPet = props.clientChangeNotSetPet,
+    previewItemTitleRender = props.previewItemTitleRender;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loadLoading = _useState2[0],
@@ -58,11 +63,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 +80,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 +92,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: 获取表单数据
@@ -181,6 +188,8 @@ var Pet = function Pet() {
         payload,
         _state$bookingDetail4,
         _state$bookingDetail5,
+        _state$client3,
+        _state$client3$value,
         records,
         _args2 = arguments;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -227,12 +236,13 @@ var Pet = function Pet() {
             }
             _context2.next = 16;
             return state.apis.getFormRecords({
-              form_record_ids: (_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 ? void 0 : (_state$bookingDetail5 = _state$bookingDetail4.holder) === null || _state$bookingDetail5 === void 0 ? void 0 : _state$bookingDetail5.form_record
+              form_record_ids: (_state$bookingDetail4 = state.bookingDetail) === null || _state$bookingDetail4 === void 0 ? void 0 : (_state$bookingDetail5 = _state$bookingDetail4.holder) === null || _state$bookingDetail5 === void 0 ? void 0 : _state$bookingDetail5.form_record,
+              with: ['customer']
             });
           case 16:
             records = _context2.sent;
             console.log("records", records);
-            values[boardParams === null || boardParams === void 0 ? void 0 : boardParams.form_id] = records;
+            values[boardParams === null || boardParams === void 0 ? void 0 : boardParams.form_id] = sortFormValues(records, (_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : (_state$client3$value = _state$client3.value) === null || _state$client3$value === void 0 ? void 0 : _state$client3$value.id);
             payload.value = values;
             setValueLoading(false);
           case 21:
@@ -259,14 +269,14 @@ var Pet = function Pet() {
     };
   }();
   var handleViewItem = function handleViewItem(item) {
-    var _state$client3, _state$client3$value;
+    var _state$client4, _state$client4$value;
     var _data = {
       formDataConfig: _objectSpread({}, petForm),
       record: item
     };
-    if (petForm.data_range === "customer" && !isWalkIn((_state$client3 = state.client) === null || _state$client3 === void 0 ? void 0 : (_state$client3$value = _state$client3.value) === null || _state$client3$value === void 0 ? void 0 : _state$client3$value.id)) {
-      var _state$client4, _state$client4$value;
-      _data.customerId = (_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : (_state$client4$value = _state$client4.value) === null || _state$client4$value === void 0 ? void 0 : _state$client4$value.id;
+    if (petForm.data_range === "customer" && !isWalkIn((_state$client4 = state.client) === null || _state$client4 === void 0 ? void 0 : (_state$client4$value = _state$client4.value) === null || _state$client4$value === void 0 ? void 0 : _state$client4$value.id)) {
+      var _state$client5, _state$client5$value;
+      _data.customerId = (_state$client5 = state.client) === null || _state$client5 === void 0 ? void 0 : (_state$client5$value = _state$client5.value) === null || _state$client5$value === void 0 ? void 0 : _state$client5$value.id;
     }
     state.action({
       type: "pisell1.goCustomFormDetail",
@@ -278,7 +288,9 @@ var Pet = function Pet() {
             return d.form_record_id !== item.form_record_id;
           });
         } else {
-          var obj = {};
+          var obj = {
+            customer: item === null || item === void 0 ? void 0 : item.customer
+          };
           var _iterator = _createForOfIteratorHelper(res),
             _step;
           try {
@@ -303,14 +315,14 @@ var Pet = function Pet() {
     });
   };
   var handleEditItem = function handleEditItem(item) {
-    var _state$client5, _state$client5$value;
+    var _state$client6, _state$client6$value;
     var _data = {
       formDataConfig: _objectSpread({}, petForm),
       record: item
     };
-    if (petForm.data_range === "customer" && !isWalkIn((_state$client5 = state.client) === null || _state$client5 === void 0 ? void 0 : (_state$client5$value = _state$client5.value) === null || _state$client5$value === void 0 ? void 0 : _state$client5$value.id)) {
-      var _state$client6, _state$client6$value;
-      _data.customerId = (_state$client6 = state.client) === null || _state$client6 === void 0 ? void 0 : (_state$client6$value = _state$client6.value) === null || _state$client6$value === void 0 ? void 0 : _state$client6$value.id;
+    if (petForm.data_range === "customer" && !isWalkIn((_state$client6 = state.client) === null || _state$client6 === void 0 ? void 0 : (_state$client6$value = _state$client6.value) === null || _state$client6$value === void 0 ? void 0 : _state$client6$value.id)) {
+      var _state$client7, _state$client7$value;
+      _data.customerId = (_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;
     }
     state.action({
       type: "pisell1.editCustomFormRecord",
@@ -344,10 +356,11 @@ var Pet = function Pet() {
 
   // 当客户id 发生改变时, 检测当前表单是否是该客户的, 如果不是则移除
   useEffect(function () {
-    var _state$pet, _state$client7, _state$client7$value, _state$pet2;
+    var _state$pet, _state$client8, _state$client8$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,
+      clientId: (_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,
       forms: ((_state$pet2 = state.pet) === null || _state$pet2 === void 0 ? void 0 : _state$pet2.formData) || []
     });
     setTimeout(function () {
@@ -358,7 +371,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 +389,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$client9 = state.client) === null || _state$client9 === void 0 ? void 0 : (_state$client9$value = _state$client9.value) === null || _state$client9$value === void 0 ? void 0 : _state$client9$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 +433,7 @@ var Pet = function Pet() {
     active: true,
     round: true
   }, /*#__PURE__*/React.createElement(FormsCom, {
-    hideTitle: true,
+    hideTitle: hideTitle,
     watch: {
       value: state.pet.value
     },
@@ -433,7 +446,7 @@ var Pet = function Pet() {
     modalOpen: state.modalOpen,
     value: state.pet.value,
     onChange: onValueChange,
-    client: (_state$client9 = state.client) === null || _state$client9 === void 0 ? void 0 : _state$client9.value,
+    client: (_state$client10 = state.client) === null || _state$client10 === void 0 ? void 0 : _state$client10.value,
     customSelectProps: {
       loading: loading,
       handleViewItem: handleViewItem,
@@ -449,7 +462,9 @@ var Pet = function Pet() {
       loadMore: loadMore,
       filterItem: function filterItem() {
         return true;
-      }
+      },
+      handleOpenModal: handleOpenModal,
+      previewItemTitleRender: previewItemTitleRender
     },
     optionRender: function optionRender(item) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Avatar, {
@@ -484,7 +499,7 @@ var Pet = function Pet() {
         }
       }, locales.getText("pisell2.text.edit"))));
     },
-    addButtonProps: {
+    addButtonProps: _objectSpread({
       style: {
         margin: 0
       },
@@ -507,7 +522,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/service/editService/index.js

@@ -507,7 +507,8 @@ var Info = function Info() {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             setResourceLoading(true);
-            _context2.next = 3;
+            _context2.prev = 1;
+            _context2.next = 4;
             return state.apis.getResources({
               skip: 1,
               num: 1000,
@@ -517,7 +518,7 @@ var Info = function Info() {
                 abort: true
               }
             });
-          case 3:
+          case 4:
             data = _context2.sent;
             // 合并无资源
             _list = [getNoResource()].concat((data === null || data === void 0 ? void 0 : data.list) || []);
@@ -527,12 +528,19 @@ var Info = function Info() {
                 resourcesOrigin: _list
               }
             });
+            _context2.next = 12;
+            break;
+          case 9:
+            _context2.prev = 9;
+            _context2.t0 = _context2["catch"](1);
+            console.log(_context2.t0, 'err');
+          case 12:
             setResourceLoading(false);
-          case 7:
+          case 13:
           case "end":
             return _context2.stop();
         }
-      }, _callee2);
+      }, _callee2, null, [[1, 9]]);
     }));
     return function getResourcesData() {
       return _ref3.apply(this, arguments);

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;
+    }
+  });
 };