@pisell/private-materials 3.0.155 → 3.0.157-gray

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

@@ -44,6 +44,7 @@ var import_utils = require("@pisell/utils");
 var import_utils2 = require("../../utils");
 var import_serve = require("./serve");
 var import_ahooks = require("ahooks");
+var isLoadClient = false;
 var Client = () => {
   var _a, _b, _c, _d, _e, _f;
   const modalRef = (0, import_react.useRef)();
@@ -53,9 +54,10 @@ var Client = () => {
   const [franchiseeLoading, setFranchiseeLoading] = (0, import_react.useState)(0);
   const [params, setParams] = (0, import_react.useState)({
     skip: 1,
-    num: 50,
+    num: 10,
     total: 0,
-    search: ""
+    search: "",
+    sort_by: "id"
   });
   const menus = (0, import_react.useMemo)(() => {
     let list = [
@@ -72,9 +74,20 @@ var Client = () => {
     customer_id,
     ...resetParams
   }) => {
-    let _setLoading = resetParams.skip === 1 ? setLoading : setLoadLoading;
+    var _a2, _b2;
+    let _setLoading;
+    if (resetParams.skip === 1) {
+      if (resetParams.search) {
+        _setLoading = setLoading;
+      } else {
+        _setLoading = isLoadClient || ((_b2 = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.clients) == null ? void 0 : _b2.length) ? () => {
+        } : setLoading;
+      }
+    } else {
+      _setLoading = setLoadLoading;
+    }
     _setLoading(true);
-    const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClients;
+    const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClientsEs;
     const data = await api({
       ...resetParams,
       ...!state.isFranchisee ? { _config: { abort: true } } : {}
@@ -111,7 +124,9 @@ var Client = () => {
       type: "setClient",
       payload: _payload
     });
-    _setLoading(false);
+    setLoading(false);
+    setLoadLoading(false);
+    isLoadClient = true;
     return {};
   };
   const handleOpenClientModal = () => {
@@ -127,7 +142,8 @@ var Client = () => {
       if ((0, import_utils2.isWalkIn)(item == null ? void 0 : item.id)) {
         return import_utils.locales.getText("pisell2.text.select-a-customer");
       }
-      return item.name || (item.display_name || "").trim() || (item.nickname || "").trim() || "";
+      const firstLastName = item.first_name || item.last_name ? `${item.first_name} ${item.last_name}` : "";
+      return item.name || (item.display_name || "").trim() || (item.nickname || "").trim() || firstLastName.trim() || "";
     },
     [import_utils.locales.localeMap]
   );
@@ -201,12 +217,16 @@ var Client = () => {
         showReceiveAddress: false,
         showAcceptsMarketing: false
       },
-      callback: (customer_id) => {
-        getClients({
-          ...state.client.clientsParams,
-          search: "",
-          customer_id,
-          skip: 1
+      callback: (customer_id, params2) => {
+        var _a2, _b2, _c2;
+        dispatch({
+          type: "setClient",
+          payload: {
+            clients: [
+              ...((_a2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _a2.customer) ? [{ ...(_b2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _b2.customer, id: customer_id }] : [],
+              ...((_c2 = state.client) == null ? void 0 : _c2.clients) || []
+            ]
+          }
         });
       }
     });
@@ -289,7 +309,6 @@ var Client = () => {
         mode: "single",
         createItemText: import_utils.locales.getText("pisell2.text.create-new-customer"),
         closeCallback: () => {
-          searchChange("");
         },
         optionRender: (item) => {
           return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
@@ -309,14 +328,7 @@ var Client = () => {
         }
       }
     );
-  }, [
-    state,
-    renderList,
-    loading,
-    franchiseeLoading,
-    params.search,
-    loadMore
-  ]);
+  }, [state, renderList, loading, franchiseeLoading, params.search, loadMore]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

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

@@ -1,5 +1,5 @@
-import React from "react";
-import { FormState } from "../../../model";
+import React from 'react';
+import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;
     setGlobalState: (val: any) => void;
@@ -7,7 +7,7 @@ interface useClientFnParams {
     onRemoveClient?: () => void;
 }
 declare const useClientFn: (_params: useClientFnParams) => {
-    setClient: (client: Partial<FormState["client"]>) => void;
+    setClient: (client: Partial<FormState['client']>) => void;
     isWalkIn: boolean;
     handleSelectClient: (value: any) => Promise<unknown>;
     menuChange: (e: any) => void;
@@ -16,7 +16,7 @@ declare const useClientFn: (_params: useClientFnParams) => {
         key: string;
         label: any;
     }[];
-    handleCreateItem: () => void;
+    handleCreateItem: (cb?: () => void) => void;
     getClients: ({ customer_id, customer_ids, ...resetParams }: {
         customer_id?: number | undefined;
         skip?: number | undefined;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.js

@@ -38,15 +38,18 @@ var import_serve = require("../../client/serve");
 var import_model = require("../../model");
 var import_utils2 = require("@pisell/utils");
 var import_antd = require("antd");
+var import_useIsLowSpeedNetwork = __toESM(require("./useIsLowSpeedNetwork"));
+var isLoadClient = false;
 var useClientFn = (_params) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const { state, setGlobalState, modalRef, onRemoveClient } = _params;
   const [loadLoading, setLoadLoading] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [franchiseeLoading, setFranchiseeLoading] = (0, import_react.useState)(0);
+  const isLowSpeedNetwork = (0, import_useIsLowSpeedNetwork.default)();
   const [params, setParams] = (0, import_react.useState)({
     skip: 1,
-    num: 50,
+    num: 5,
     total: 0,
     search: "",
     with: ["formRecord"],
@@ -74,21 +77,33 @@ var useClientFn = (_params) => {
     customer_ids,
     ...resetParams
   }, returnResult) => {
-    let _setLoading = resetParams.skip === 1 ? setLoading : setLoadLoading;
+    var _a2, _b2;
+    let _setLoading;
+    if (resetParams.skip === 1) {
+      if (resetParams.search) {
+        _setLoading = setLoading;
+      } else {
+        _setLoading = isLoadClient || ((_b2 = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.clients) == null ? void 0 : _b2.length) ? () => {
+        } : setLoading;
+      }
+    } else {
+      _setLoading = setLoadLoading;
+    }
     _setLoading(true);
     const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClients;
     const data = await api({
       ...resetParams,
+      ...resetParams.search ? { num: 10 } : {},
       ...state.isFranchisee ? { franchisee_customer_ids: customer_ids } : { customer_ids },
       ...!state.isFranchisee && !returnResult ? { _config: { abort: true } } : {}
     });
     const list = ((data == null ? void 0 : data.list) || []).map((d) => {
-      var _a2;
+      var _a3;
       return {
         ...d,
         name: getNickname(d),
         id: d.franchisee_customer_id || d.id,
-        form_record: ((_a2 = d.form_record) == null ? void 0 : _a2.map((item) => ({
+        form_record: ((_a3 = d.form_record) == null ? void 0 : _a3.map((item) => ({
           ...item,
           ...item.data,
           form_record_id: item.id
@@ -126,7 +141,9 @@ var useClientFn = (_params) => {
         ..._payload
       }
     });
-    _setLoading(false);
+    isLoadClient = true;
+    setLoading(false);
+    setLoadLoading(false);
     return {};
   };
   const handleOpenClientModal = (val) => {
@@ -215,7 +232,8 @@ var useClientFn = (_params) => {
       if ((0, import_utils.isWalkIn)(item == null ? void 0 : item.id)) {
         return import_utils2.locales.getText("pisell2.text.select-a-customer");
       }
-      return item.name || (item.display_name || "").trim() || (item.nickname || "").trim() || "";
+      const firstLastName = item.first_name || item.last_name ? `${item.first_name} ${item.last_name}` : "";
+      return item.name || (item.display_name || "").trim() || (item.nickname || "").trim() || firstLastName.trim() || "";
     },
     [import_utils2.locales.localeMap]
   );
@@ -254,19 +272,21 @@ var useClientFn = (_params) => {
       resolve(0);
     });
   };
-  const handleCreateItem = () => {
+  const handleCreateItem = (cb) => {
     state.action({
       type: "pisell1.handleOpenAddCustomerModal",
       data: {
         showReceiveAddress: false,
         showAcceptsMarketing: false
       },
-      callback: (customer_id) => {
-        getClients({
-          ...state.client.clientsParams,
-          search: "",
-          customer_id,
-          skip: 1
+      callback: (customer_id, params2) => {
+        var _a2, _b2, _c2;
+        cb == null ? void 0 : cb();
+        setClient({
+          clients: [
+            ...((_a2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _a2.customer) ? [{ ...(_b2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _b2.customer, id: customer_id, form_record: [] }] : [],
+            ...((_c2 = state.client) == null ? void 0 : _c2.clients) || []
+          ]
         });
       }
     });

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

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
+export default useIsLowSpeedNetwork;

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.js

@@ -0,0 +1,36 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.ts
+var useIsLowSpeedNetwork_exports = {};
+__export(useIsLowSpeedNetwork_exports, {
+  default: () => useIsLowSpeedNetwork_default
+});
+module.exports = __toCommonJS(useIsLowSpeedNetwork_exports);
+var import_react = require("react");
+var import_ahooks = require("ahooks");
+var useIsLowSpeedNetwork = () => {
+  const networkState = (0, import_ahooks.useNetwork)();
+  const isLowSpeedNetwork = (0, import_react.useRef)(false);
+  const isLowSpeedNetworkMemo = (0, import_react.useMemo)(() => {
+    return ["slow-2g", "2g", "3g"].includes((networkState == null ? void 0 : networkState.effectiveType) || "") || ((networkState == null ? void 0 : networkState.downlink) || 20) <= 1 || ((networkState == null ? void 0 : networkState.rtt) || 0) > 500;
+  }, [networkState]);
+  isLowSpeedNetwork.current = isLowSpeedNetworkMemo;
+  return isLowSpeedNetwork;
+};
+var useIsLowSpeedNetwork_default = useIsLowSpeedNetwork;

package/lib/components/booking/info/clientVariant/vertical/SelectDrawer.d.ts

@@ -1,10 +1,10 @@
-import React from "react";
-import "./SelectDrawer.less";
+import React from 'react';
+import './SelectDrawer.less';
 interface SelectDrawerProps {
     autoFocus?: boolean;
     onClose: () => void;
     handleSelectClient: (val: any) => void;
-    handleCreateItem: () => void;
+    handleCreateItem: (cb: () => void) => void;
     handleSelectPet: (val: any) => void;
     childrenValue: any[];
     formData: any;
@@ -18,6 +18,7 @@ interface SelectDrawerProps {
     handleAddPet: any;
     modalOpen: boolean;
     franchiseeLoading?: number;
+    showHeader?: boolean;
 }
 declare const _default: React.ForwardRefExoticComponent<SelectDrawerProps & React.RefAttributes<unknown>>;
 export default _default;

package/lib/components/booking/info/clientVariant/vertical/SelectDrawer.js

@@ -107,14 +107,20 @@ var SelectDrawer = (props, ref) => {
     showPet,
     handleAddPet,
     modalOpen,
-    franchiseeLoading
+    franchiseeLoading,
+    showHeader
   } = props;
   const form = (formData == null ? void 0 : formData[0]) || {};
   const valList = (childrenValue == null ? void 0 : childrenValue[form.id]) || defaultArr;
   const [_value, setValue] = (0, import_react.useState)(valList);
   const clientRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
-    setValue(valList.map((item) => ({ ...item, id: item.id || item.form_record_id })));
+    setValue(
+      valList.map((item) => ({
+        ...item,
+        id: item.id || item.form_record_id
+      }))
+    );
   }, [valList]);
   const searchRef = (0, import_react.useRef)();
   const [open, setOpen] = (0, import_react.useState)(false);
@@ -160,12 +166,15 @@ var SelectDrawer = (props, ref) => {
       if ((0, import_utils2.isWalkIn)(item == null ? void 0 : item.id)) {
         return import_utils.locales.getText("pisell2.text.select-a-customer");
       }
-      return item.name || (item.display_name || "").trim() || (item.nickname || "").trim() || "";
+      const firstLastName = item.first_name || item.last_name ? `${item.first_name} ${item.last_name}` : "";
+      return item.name || (item.display_name || "").trim() || (item.nickname || "").trim() || firstLastName.trim() || "";
     },
     [import_utils.locales.localeMap]
   );
   const handleAddClient = () => {
-    handleCreateItem();
+    handleCreateItem(() => {
+      setSearch("");
+    });
   };
   const handleChildrenValueChange = async (value, item) => {
     var _a;
@@ -250,7 +259,10 @@ var SelectDrawer = (props, ref) => {
             ...isHasChildren ? [] : (0, import_format.formatAddFormValues)({
               clientId: item.id,
               data_range: holder.data_range,
-              value: (_a = item.form_record) == null ? void 0 : _a.map((f) => ({ ...f, customer: item }))
+              value: (_a = item.form_record) == null ? void 0 : _a.map((f) => ({
+                ...f,
+                customer: item
+              }))
             })
           ],
           "id"
@@ -262,7 +274,8 @@ var SelectDrawer = (props, ref) => {
   return /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
-      title: import_utils.locales.getText("pisell2.text.select-customer"),
+      showGoBack: showHeader,
+      title: showHeader && import_utils.locales.getText("pisell2.text.select-customer"),
       open,
       onClose: closeDrawer,
       header: /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
@@ -287,9 +300,18 @@ var SelectDrawer = (props, ref) => {
       getContainer: false,
       destroyOnClose: true,
       push: { distance: 180 },
-      footer: mode === "multiple" && /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { block: true, type: "primary", onClick: handleOk, loading: !!franchiseeLoading }, import_utils.locales.getText("pisell2.text.apply")))
+      footer: mode === "multiple" && /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Button,
+        {
+          block: true,
+          type: "primary",
+          onClick: handleOk,
+          loading: !!franchiseeLoading
+        },
+        import_utils.locales.getText("pisell2.text.apply")
+      ))
     },
-    /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: loading }, /* @__PURE__ */ import_react.default.createElement("div", { className: "vertical-client-select-drawer-content-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "vertical-client-select-drawer-top" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "vertical-client-select-drawer-content-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "vertical-client-select-drawer-top" }, /* @__PURE__ */ import_react.default.createElement(
       ActionItem,
       {
         title: import_utils.locales.getText("pisell2.text.create-new-customer"),
@@ -304,7 +326,7 @@ var SelectDrawer = (props, ref) => {
           closeDrawer();
         }
       }
-    )), !!options.length ? options.map((item) => {
+    )), /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: !!loading, delay: 500 }, !!options.length ? options.map((item) => {
       var _a;
       return /* @__PURE__ */ import_react.default.createElement(
         "div",
@@ -332,7 +354,10 @@ var SelectDrawer = (props, ref) => {
             "div",
             {
               onClick: () => {
-                handleChildrenValueChange({ ...f, customer: item }, item);
+                handleChildrenValueChange(
+                  { ...f, customer: item },
+                  item
+                );
               },
               id: `${f.id}`,
               key: f.id,
@@ -344,7 +369,14 @@ var SelectDrawer = (props, ref) => {
               )
             },
             mode === "multiple" && /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { checked }),
-            /* @__PURE__ */ import_react.default.createElement(Item, { coverSize: 48, title: f.main_field, loading: false })
+            /* @__PURE__ */ import_react.default.createElement(
+              Item,
+              {
+                coverSize: 48,
+                title: f.main_field,
+                loading: false
+              }
+            )
           );
         }), /* @__PURE__ */ import_react.default.createElement(
           "div",

package/lib/components/booking/info/clientVariant/vertical/index.d.ts

@@ -4,5 +4,5 @@ interface VerticalClientProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const VerticalClient: (props: VerticalClientProps) => React.JSX.Element;
+declare const VerticalClient: React.ForwardRefExoticComponent<VerticalClientProps & React.RefAttributes<unknown>>;
 export default VerticalClient;