@pisell/private-materials 3.0.37 → 3.0.39

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

@@ -27,7 +27,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 
 import React, { useContext, useEffect, useMemo, useState } from "react";
 import SearchLg from "@pisell/icon/es/SearchLg";
-import { Input, Button } from "antd";
+import { Input, Button, Skeleton } from "antd";
 import Drawer from "../components/drawer";
 import TabPane from "../components/tabPane";
 import { Context, Provider } from "./model";
@@ -119,10 +119,14 @@ var Addons = Provider(function (props) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var _useState3 = useState(""),
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    search = _useState4[0],
-    setSearch = _useState4[1];
+    listLoading = _useState4[0],
+    setListLoading = _useState4[1];
+  var _useState5 = useState(""),
+    _useState6 = _slicedToArray(_useState5, 2),
+    search = _useState6[0],
+    setSearch = _useState6[1];
   var context = useEngineContext();
   var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
     isTerminal = _ref.isTerminal,
@@ -150,7 +154,6 @@ var Addons = Provider(function (props) {
    * @Date: 2024-01-30 16:34
    */
   var init = function init() {
-    getProducts();
     getAddonsByOrderId();
   };
   useEffect(function () {
@@ -221,7 +224,8 @@ var Addons = Provider(function (props) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
+            setListLoading(true);
+            _context2.next = 3;
             return state.apis.getProducts({
               skip: 1,
               num: 500,
@@ -233,17 +237,21 @@ var Addons = Provider(function (props) {
               // include_variant: "no",
               open_quotation: 1,
               with_schedule: 0,
-              with_count: ["bundleGroup", "optionGroup"]
+              with_count: ["bundleGroup", "optionGroup"],
+              _config: {
+                useCache: true
+              }
             });
-          case 2:
+          case 3:
             data = _context2.sent;
+            setListLoading(false);
             dispatch({
               type: "setAddons",
               payload: {
                 originData: (data === null || data === void 0 ? void 0 : data.list) || []
               }
             });
-          case 4:
+          case 6:
           case "end":
             return _context2.stop();
         }
@@ -266,7 +274,7 @@ var Addons = Provider(function (props) {
     var _list = _toConsumableArray(state.addons.value);
 
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === "detail" || item.option_group_count > 0 || item.bundle_group_count > 0 || item.variant_count > 0;
+    var isEject = type === "detail" || item.bundle_group_count > 0;
     state.action({
       type: "pisell1.handleOpenProductModal",
       data: {
@@ -405,6 +413,7 @@ var Addons = Provider(function (props) {
         }
       });
     }
+    getProducts();
     setSearch("");
     dispatch({
       type: "setAddons",
@@ -543,11 +552,18 @@ var Addons = Provider(function (props) {
     }))
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-body"
+  }, /*#__PURE__*/React.createElement(Skeleton, {
+    loading: listLoading,
+    active: true,
+    round: true,
+    style: {
+      padding: 20
+    }
   }, /*#__PURE__*/React.createElement(TabProduct, {
     scrollDom: ".booking-addons-wrap .pisell-lowcode-drawer-body",
     list: renderList,
     amountSymbol: state.amountSymbol,
     onChange: handleAddProduct
-  }))))));
+  })))))));
 });
 export default Addons;

package/es/components/booking/components/TabProduct/productItem/index.js

@@ -17,21 +17,21 @@ var ProductItem = function ProductItem(_ref) {
     }
   }, item.cover ? /*#__PURE__*/React.createElement("img", {
     src: image.ali(item.cover, 100),
-    className: "server-product-cover",
-    onClick: function onClick(e) {
-      e.preventDefault();
-      e.stopPropagation();
-      _onClick(item, "detail");
-    }
+    className: "server-product-cover"
+    // onClick={(e) => {
+    // 	e.preventDefault();
+    // 	e.stopPropagation();
+    // 	onClick(item, "detail");
+    // }}
   }) : null, /*#__PURE__*/React.createElement("div", {
     className: "server-product-content"
   }, /*#__PURE__*/React.createElement("span", {
-    className: "server-product-title",
-    onClick: function onClick(e) {
-      e.preventDefault();
-      e.stopPropagation();
-      _onClick(item, "detail");
-    }
+    className: "server-product-title"
+    // onClick={(e) => {
+    // 	e.preventDefault();
+    // 	e.stopPropagation();
+    // 	onClick(item, "detail");
+    // }}
   }, item.title), /*#__PURE__*/React.createElement("div", {
     className: "server-product-time"
   }, getDiscountTime(item.service_times)), /*#__PURE__*/React.createElement("div", {

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

@@ -331,9 +331,19 @@ var CustomSelect = function CustomSelect(props, ref) {
       className: "pisell-lowcode__custom-select-card-menu-icon"
     })))));
   })), isShowAddButton ? addButtonRender ? addButtonRender() : /*#__PURE__*/React.createElement(AddButton, _extends({
-    showSub: isMore,
-    onClick: handleOpenModal
-  }, addButtonProps)) : disabled ? /*#__PURE__*/React.createElement("div", {
+    showSub: isMore
+  }, addButtonProps, {
+    onClick: function onClick() {
+      if (addButtonProps.addCallback) {
+        addButtonProps === null || addButtonProps === void 0 ? void 0 : addButtonProps.addCallback();
+      }
+      if (addButtonProps.onClick) {
+        addButtonProps.onClick();
+        return;
+      }
+      handleOpenModal();
+    }
+  })) : disabled ? /*#__PURE__*/React.createElement("div", {
     style: {
       height: 20
     }

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

@@ -132,6 +132,10 @@ var Info = function Info() {
     if (state.disabledEdit) {
       return;
     }
+    getClients(_objectSpread(_objectSpread({}, params), {}, {
+      search: "",
+      skip: 1
+    }));
     (_modalRef$current = modalRef.current) === null || _modalRef$current === void 0 ? void 0 : _modalRef$current.open();
   };
   var getNickname = useCallback(function (item) {
@@ -210,12 +214,7 @@ var Info = function Info() {
     var _state$client$value;
     return getIsWalkIn((_state$client$value = state.client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id);
   }, [(_state$client$value2 = state.client.value) === null || _state$client$value2 === void 0 ? void 0 : _state$client$value2.id]);
-  useEffect(function () {
-    getClients(_objectSpread(_objectSpread({}, params), {}, {
-      search: "",
-      skip: 1
-    }));
-  }, []);
+  useEffect(function () {}, []);
   useEffect(function () {
     if (state.action) {
       state.action({

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

@@ -117,11 +117,13 @@ var Pet = function Pet() {
             dispatch({
               type: "setPet",
               payload: {
-                formData: [_objectSpread(_objectSpread(_objectSpread({}, formData), formData.form), {}, {
-                  form_id: formData.form.id,
-                  options: _list,
-                  type: formData.type
+                formData: [_objectSpread(_objectSpread({}, formData), {}, {
+                  // ...formData.form,
+                  // form_id: formData.form.id,
+                  options: _list
+                  // type: formData.type,
                 })],
+
                 pets: _list
               }
             });
@@ -152,25 +154,26 @@ var Pet = function Pet() {
         _state$bookingDetail,
         _state$bookingDetail$,
         formData,
+        payload,
         _args2 = arguments;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             isUpdateValue = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : true;
-            setLoading(true);
+            // setLoading(true);
             values = _objectSpread({}, state.pet.value);
             isSetValue = isUpdateValue && values[params === null || params === void 0 ? void 0 : params.form_id] === undefined;
             if (isSetValue) {
               setValueLoading(true);
             }
-            _context2.prev = 5;
-            _context2.next = 8;
+            _context2.prev = 4;
+            _context2.next = 7;
             return state.apis.getForms({
-              relation_type: state.renderType === 'eventBooking' ? "event_booking_v2" : "appointment_booking",
+              relation_type: state.renderType === "eventBooking" ? "event_booking_v2" : "appointment_booking",
               relation_id: ((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : (_state$bookingDetail$ = _state$bookingDetail.bookings) === null || _state$bookingDetail$ === void 0 ? void 0 : _state$bookingDetail$.id) || 0
               // _config: { useCache: true },
             });
-          case 8:
+          case 7:
             formData = _context2.sent;
             // 只要预约主体
             formData = (formData || []).filter(function (d) {
@@ -178,36 +181,35 @@ var Pet = function Pet() {
             })[0];
 
             // 获取当前预约中填写的值, 只在第一次执行
+            payload = {
+              formData: [_objectSpread(_objectSpread(_objectSpread({}, formData), formData.form), {}, {
+                form_id: formData.form.id,
+                options: [],
+                type: formData.type
+              })]
+            };
             if (isSetValue) {
               values[params === null || params === void 0 ? void 0 : params.form_id] = formData.form_record;
+              payload.value = values;
               setValueLoading(false);
-              dispatch({
-                type: "setPet",
-                payload: {
-                  value: values
-                }
-              });
             }
-
-            // 获取表单下的数据
-            _context2.next = 13;
-            return getFormData({
-              formData: formData
+            dispatch({
+              type: "setPet",
+              payload: payload
             });
-          case 13:
-            _context2.next = 20;
+            _context2.next = 19;
             break;
-          case 15:
-            _context2.prev = 15;
-            _context2.t0 = _context2["catch"](5);
+          case 14:
+            _context2.prev = 14;
+            _context2.t0 = _context2["catch"](4);
             setValueLoading(false);
             setLoading(false);
             console.log("form_error", _context2.t0);
-          case 20:
+          case 19:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[5, 15]]);
+      }, _callee2, null, [[4, 14]]);
     }));
     return function getForms() {
       return _ref3.apply(this, arguments);
@@ -325,10 +327,19 @@ var Pet = function Pet() {
       getForms(true);
     }
   }, [state.bookingId, state.bookingDetail, params.form_id, params.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]);
+  var _addCallback = function addCallback() {
+    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];
+    if ((_formData === null || _formData === void 0 ? void 0 : _formData.type) === "multiple" || (_formData === null || _formData === void 0 ? void 0 : _formData.type) === "single") {
+      getFormData({
+        formData: _formData
+      });
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-pet-wraps"
   }, /*#__PURE__*/React.createElement(Skeleton, {
-    loading: loading,
+    loading: valueLoading,
     active: true,
     round: true
   }, /*#__PURE__*/React.createElement(FormsCom, {
@@ -337,7 +348,7 @@ var Pet = function Pet() {
       value: state.pet.value
     },
     addCallback: function addCallback() {
-      getForms(false);
+      _addCallback();
     },
     loading: valueLoading,
     forms: state.pet.formData,
@@ -347,7 +358,7 @@ var Pet = function Pet() {
     onChange: onValueChange,
     client: (_state$client9 = state.client) === null || _state$client9 === void 0 ? void 0 : _state$client9.value,
     customSelectProps: {
-      // loading: loading,
+      loading: loading,
       handleViewItem: handleViewItem,
       virtualListHeight: window.innerHeight - 213 - 57 - 16,
       disabled: state.disabledEdit
@@ -388,7 +399,24 @@ var Pet = function Pet() {
     addButtonProps: {
       style: {
         margin: 0
-      }
+      },
+      addCallback: function () {
+        var _addCallback2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                _addCallback();
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        function addCallback() {
+          return _addCallback2.apply(this, arguments);
+        }
+        return addCallback;
+      }()
     }
   })));
 };

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

@@ -150,7 +150,10 @@ var Info = function Info() {
               ids: state.renderType === "eventBooking" ? (_state$eventOtherPara = state.eventOtherParams) === null || _state$eventOtherPara === void 0 ? void 0 : _state$eventOtherPara.productIds : undefined,
               open_quotation: 1,
               with_schedule: 1,
-              with_count: ["bundleGroup", "optionGroup"]
+              with_count: ["bundleGroup", "optionGroup"],
+              _config: {
+                useCache: true
+              }
             });
           case 3:
             data = _context2.sent;
@@ -173,6 +176,7 @@ var Info = function Info() {
     };
   }();
   var handleSelectService = function handleSelectService() {
+    getServices();
     setSearch("");
     dispatch({
       type: "setService",
@@ -183,7 +187,7 @@ var Info = function Info() {
   };
   var handleSelectProduct = function handleSelectProduct(item, type) {
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === "detail" || item.option_group_count > 0 || item.bundle_group_count > 0 || item.variant_count > 0;
+    var isEject = type === "detail" || item.bundle_group_count > 0;
     state.action({
       type: "pisell1.handleOpenProductModal",
       data: {
@@ -246,16 +250,9 @@ var Info = function Info() {
   var isService = useMemo(function () {
     return state.service.value.length > 0;
   }, [state.service.value]);
-
-  /**
-   *  页面加完完毕 和 弹窗打开时 均调用下接口 更新数据
-   */
-  useEffect(function () {
-    getServices();
-  }, []);
   useEffect(function () {
     if (state.modalOpen) {
-      getServices();
+      // getServices();
     }
   }, [state.modalOpen]);
   var showAddButton = useMemo(function () {

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

@@ -123,6 +123,7 @@ var Addons = (0, import_model.Provider)((props) => {
   const { globalState } = props;
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [loading, setLoading] = (0, import_react.useState)(false);
+  const [listLoading, setListLoading] = (0, import_react.useState)(false);
   const [search, setSearch] = (0, import_react.useState)("");
   const context = (0, import_useEngineContext.default)();
   const { isTerminal, interaction } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
@@ -143,7 +144,6 @@ var Addons = (0, import_model.Provider)((props) => {
     });
   }, [globalState]);
   const init = () => {
-    getProducts();
     getAddonsByOrderId();
   };
   (0, import_react.useEffect)(() => {
@@ -177,6 +177,7 @@ var Addons = (0, import_model.Provider)((props) => {
     setLoading(false);
   };
   const getProducts = async () => {
+    setListLoading(true);
     let data = await state.apis.getProducts({
       skip: 1,
       num: 500,
@@ -193,8 +194,12 @@ var Addons = (0, import_model.Provider)((props) => {
       // include_variant: "no",
       open_quotation: 1,
       with_schedule: 0,
-      with_count: ["bundleGroup", "optionGroup"]
+      with_count: ["bundleGroup", "optionGroup"],
+      _config: {
+        useCache: true
+      }
     });
+    setListLoading(false);
     dispatch({
       type: "setAddons",
       payload: {
@@ -204,7 +209,7 @@ var Addons = (0, import_model.Provider)((props) => {
   };
   const handleAddProduct = (item, type) => {
     let _list = [...state.addons.value];
-    const isEject = type === "detail" || item.option_group_count > 0 || item.bundle_group_count > 0 || item.variant_count > 0;
+    const isEject = type === "detail" || item.bundle_group_count > 0;
     state.action({
       type: "pisell1.handleOpenProductModal",
       data: {
@@ -306,6 +311,7 @@ var Addons = (0, import_model.Provider)((props) => {
         }
       });
     }
+    getProducts();
     setSearch("");
     dispatch({
       type: "setAddons",
@@ -439,13 +445,22 @@ var Addons = (0, import_model.Provider)((props) => {
         ))
       },
       /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body" }, /* @__PURE__ */ import_react.default.createElement(
-        import_TabProduct.default,
+        import_antd.Skeleton,
         {
-          scrollDom: ".booking-addons-wrap .pisell-lowcode-drawer-body",
-          list: renderList,
-          amountSymbol: state.amountSymbol,
-          onChange: handleAddProduct
-        }
+          loading: listLoading,
+          active: true,
+          round: true,
+          style: { padding: 20 }
+        },
+        /* @__PURE__ */ import_react.default.createElement(
+          import_TabProduct.default,
+          {
+            scrollDom: ".booking-addons-wrap .pisell-lowcode-drawer-body",
+            list: renderList,
+            amountSymbol: state.amountSymbol,
+            onChange: handleAddProduct
+          }
+        )
       ))
     ))
   ));

package/lib/components/booking/components/TabProduct/productItem/index.js

@@ -57,23 +57,13 @@ var ProductItem = ({
       "img",
       {
         src: import_utils.image.ali(item.cover, 100),
-        className: "server-product-cover",
-        onClick: (e) => {
-          e.preventDefault();
-          e.stopPropagation();
-          onClick(item, "detail");
-        }
+        className: "server-product-cover"
       }
     ) : null,
     /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-content" }, /* @__PURE__ */ import_react.default.createElement(
       "span",
       {
-        className: "server-product-title",
-        onClick: (e) => {
-          e.preventDefault();
-          e.stopPropagation();
-          onClick(item, "detail");
-        }
+        className: "server-product-title"
       },
       item.title
     ), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-time" }, (0, import_utils2.getDiscountTime)(item.service_times)), /* @__PURE__ */ import_react.default.createElement("div", { className: "server-product-price" }, (0, import_utils.formatAmount)(item.price, 2, amountSymbol)))

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

@@ -222,8 +222,17 @@ var CustomSelect = (props, ref) => {
     import_addButton.default,
     {
       showSub: isMore,
-      onClick: handleOpenModal,
-      ...addButtonProps
+      ...addButtonProps,
+      onClick: () => {
+        if (addButtonProps.addCallback) {
+          addButtonProps == null ? void 0 : addButtonProps.addCallback();
+        }
+        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,

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

@@ -110,6 +110,7 @@ var Info = () => {
     if (state.disabledEdit) {
       return;
     }
+    getClients({ ...params, search: "", skip: 1 });
     (_a2 = modalRef.current) == null ? void 0 : _a2.open();
   };
   const getNickname = (0, import_react.useCallback)(
@@ -193,7 +194,6 @@ var Info = () => {
     return (0, import_utils2.isWalkIn)((_a2 = state.client.value) == null ? void 0 : _a2.id);
   }, [(_a = state.client.value) == null ? void 0 : _a.id]);
   (0, import_react.useEffect)(() => {
-    getClients({ ...params, search: "", skip: 1 });
   }, []);
   (0, import_react.useEffect)(() => {
     if (state.action) {

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

@@ -76,10 +76,10 @@ var Pet = () => {
         formData: [
           {
             ...formData,
-            ...formData.form,
-            form_id: formData.form.id,
-            options: _list,
-            type: formData.type
+            // ...formData.form,
+            // form_id: formData.form.id,
+            options: _list
+            // type: formData.type,
           }
         ],
         pets: _list
@@ -89,7 +89,6 @@ var Pet = () => {
   };
   const getForms = async (isUpdateValue = true) => {
     var _a2, _b2;
-    setLoading(true);
     let values = {
       ...state.pet.value
     };
@@ -106,17 +105,26 @@ var Pet = () => {
       formData = (formData || []).filter(
         (d) => d.form_id === (params == null ? void 0 : params.form_id)
       )[0];
+      let payload = {
+        formData: [
+          {
+            ...formData,
+            ...formData.form,
+            form_id: formData.form.id,
+            options: [],
+            type: formData.type
+          }
+        ]
+      };
       if (isSetValue) {
         values[params == null ? void 0 : params.form_id] = formData.form_record;
+        payload.value = values;
         setValueLoading(false);
-        dispatch({
-          type: "setPet",
-          payload: {
-            value: values
-          }
-        });
       }
-      await getFormData({ formData });
+      dispatch({
+        type: "setPet",
+        payload
+      });
     } catch (err) {
       setValueLoading(false);
       setLoading(false);
@@ -213,13 +221,20 @@ var Pet = () => {
     params.type,
     (_f = (_e = state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.id
   ]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-wraps" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading, active: true, round: true }, /* @__PURE__ */ import_react.default.createElement(
+  const addCallback = () => {
+    var _a2, _b2;
+    let _formData = (_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0];
+    if ((_formData == null ? void 0 : _formData.type) === "multiple" || (_formData == null ? void 0 : _formData.type) === "single") {
+      getFormData({ formData: _formData });
+    }
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-pet-wraps" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: valueLoading, active: true, round: true }, /* @__PURE__ */ import_react.default.createElement(
     import_forms.default,
     {
       hideTitle: true,
       watch: { value: state.pet.value },
       addCallback: () => {
-        getForms(false);
+        addCallback();
       },
       loading: valueLoading,
       forms: state.pet.formData,
@@ -229,7 +244,7 @@ var Pet = () => {
       onChange: onValueChange,
       client: (_g = state.client) == null ? void 0 : _g.value,
       customSelectProps: {
-        // loading: loading,
+        loading,
         handleViewItem,
         virtualListHeight: window.innerHeight - 213 - 57 - 16,
         disabled: state.disabledEdit
@@ -266,7 +281,12 @@ var Pet = () => {
           import_utils.locales.getText("pisell2.text.edit")
         )));
       },
-      addButtonProps: { style: { margin: 0 } }
+      addButtonProps: {
+        style: { margin: 0 },
+        addCallback: async () => {
+          addCallback();
+        }
+      }
     }
   )));
 };