@pisell/private-materials 3.0.94 → 3.0.96

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

@@ -34,6 +34,7 @@ __export(vertical_exports, {
 module.exports = __toCommonJS(vertical_exports);
 var import_react = __toESM(require("react"));
 var import_User01 = __toESM(require("@pisell/icon/es/User01"));
+var import_PlusCircle = __toESM(require("@pisell/icon/es/PlusCircle"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
 var import_useClientFn = __toESM(require("../hooks/useClientFn"));
@@ -41,14 +42,17 @@ var import_SelectDrawer = __toESM(require("./SelectDrawer"));
 var import_pet = __toESM(require("../../pet"));
 var import_index = require("./index.less");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
+var import_format = require("../../../forms/format");
+var import_utils2 = require("../../utils");
 var VerticalClient = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H;
   const { globalState, setGlobalState } = props;
   const modalRef = (0, import_react.useRef)();
   const state = globalState;
   const stateRef = (0, import_react.useRef)(state);
   const prevCustomerId = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
+  const [isHasFormRecord, setIsHasFormRecord] = (0, import_react.useState)(true);
   const isFranchisee = (_d = (_c = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.businessUtils) == null ? void 0 : _c.getAppByModal) == null ? void 0 : _d.call(_c, "franchisee");
   state.isFranchisee = isFranchisee;
   stateRef.current = state;
@@ -82,8 +86,8 @@ var VerticalClient = (props) => {
   });
   const renderList = (0, import_react.useMemo)(() => {
     let _list = [...state.client.clients];
-    return _list;
-  }, [state.client.clients]);
+    return (0, import_utils2.moveItemToFront)(_list, state.client.value.id);
+  }, [state.client.clients, state.client.value.id]);
   const handleClose = () => {
     setTimeout(() => {
       setClient({
@@ -131,7 +135,7 @@ var VerticalClient = (props) => {
   const handleOpenModal = () => {
     handleOpenClientModal();
   };
-  const handleAddPet = (_client) => {
+  const handleAddPet = (_client, cb) => {
     var _a2;
     let _data = {
       formDataConfig: { ...((_a2 = state.pet.formData) == null ? void 0 : _a2[0]) || {} }
@@ -141,14 +145,14 @@ var VerticalClient = (props) => {
       type: "pisell1.goCustomFormAddData",
       data: _data,
       callback: (res) => {
+        const newFormRecordObj = res.reduce((p, c) => {
+          return {
+            ...p,
+            [c.key]: c.value
+          };
+        }, {});
         const newClients = stateRef.current.client.clients.map((item) => {
           if (item.id === _client.id) {
-            const newFormRecordObj = res.reduce((p, c) => {
-              return {
-                ...p,
-                [c.key]: c.value
-              };
-            }, {});
             return {
               ...item,
               form_record: [
@@ -166,6 +170,7 @@ var VerticalClient = (props) => {
         setClient({
           clients: newClients
         });
+        cb == null ? void 0 : cb(newFormRecordObj);
       }
     });
   };
@@ -186,8 +191,8 @@ var VerticalClient = (props) => {
   };
   const isShowAddBtn = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2;
-    const formId = (_c2 = (_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.form_id;
-    if ((!isWalkIn || ((_f2 = (_e2 = (_d2 = state.pet) == null ? void 0 : _d2.value) == null ? void 0 : _e2[formId]) == null ? void 0 : _f2.length)) && !(state == null ? void 0 : state.disabledEdit) && boardConfig.type === "form") {
+    const formId2 = (_c2 = (_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.form_id;
+    if ((!isWalkIn || ((_f2 = (_e2 = (_d2 = state.pet) == null ? void 0 : _d2.value) == null ? void 0 : _e2[formId2]) == null ? void 0 : _f2.length)) && !(state == null ? void 0 : state.disabledEdit) && boardConfig.type === "form") {
       return true;
     }
     return false;
@@ -198,7 +203,127 @@ var VerticalClient = (props) => {
     (_l = state.pet) == null ? void 0 : _l.formData,
     boardConfig.type
   ]);
-  console.log((_m = state.pet) == null ? void 0 : _m.value, "state.pet?.value");
+  const formId = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2;
+    return (_c2 = (_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.form_id;
+  }, [(_o = (_n = (_m = state.pet) == null ? void 0 : _m.formData) == null ? void 0 : _n[0]) == null ? void 0 : _o.form_id]);
+  const currentPetValue = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
+    return (_b2 = (_a2 = state.pet) == null ? void 0 : _a2.value) == null ? void 0 : _b2[formId];
+  }, [(_p = state.pet) == null ? void 0 : _p.value, formId]);
+  const getCurrentClientSearchValue = (0, import_react.useCallback)(() => {
+    var _a2, _b2;
+    let searchVal = getNickname(state.client.value) || ((_a2 = state.client.value) == null ? void 0 : _a2.email) || ((_b2 = state.client.value) == null ? void 0 : _b2.phone) || "";
+    if (isWalkIn) {
+      searchVal = "";
+    }
+    return searchVal;
+  }, [state.client.value, isWalkIn]);
+  (0, import_react.useEffect)(() => {
+    if (!isWalkIn && formId && !(currentPetValue == null ? void 0 : currentPetValue.length) && boardConfig.type === "form") {
+      const getData = async () => {
+        var _a2, _b2, _c2, _d2, _e2, _f2;
+        const findCurrentClient = (list) => {
+          return list.find((item) => {
+            var _a3, _b3;
+            return item.id === ((_b3 = (_a3 = state.client) == null ? void 0 : _a3.value) == null ? void 0 : _b3.id);
+          });
+        };
+        const clients = (_b2 = (_a2 = stateRef.current) == null ? void 0 : _a2.client) == null ? void 0 : _b2.clients;
+        const currentClient = findCurrentClient(clients);
+        if (currentClient) {
+          setIsHasFormRecord(!!((_c2 = currentClient == null ? void 0 : currentClient.form_record) == null ? void 0 : _c2.length));
+        } else {
+          const val = await getClients(
+            {
+              with: ["formRecord"],
+              relation_form_id: boardConfig == null ? void 0 : boardConfig.form_id,
+              skip: 1,
+              num: 20,
+              customer_ids: [(_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id]
+            },
+            true
+          );
+          const currentClient2 = findCurrentClient(val);
+          setIsHasFormRecord(!!((_f2 = currentClient2 == null ? void 0 : currentClient2.form_record) == null ? void 0 : _f2.length));
+        }
+      };
+      getData();
+    }
+  }, [
+    isWalkIn,
+    formId,
+    (_q = state.client.value) == null ? void 0 : _q.id,
+    currentPetValue,
+    boardConfig
+  ]);
+  const petRender = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2;
+    if ((state == null ? void 0 : state.disabledEdit) || boardConfig.type !== "form") {
+      return null;
+    }
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !(currentPetValue == null ? void 0 : currentPetValue.length) && !isHasFormRecord && !isWalkIn && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Empty,
+      {
+        style: { marginBottom: 0 },
+        image: import_antd.Empty.PRESENTED_IMAGE_SIMPLE,
+        description: import_utils.locales.getText(
+          "pisell2.text.variant-client-no-data"
+        )
+      }
+    ), /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: "pisell-lowcode__create-form-wrap",
+        onClick: () => {
+          var _a3;
+          handleAddPet == null ? void 0 : handleAddPet((_a3 = state == null ? void 0 : state.client) == null ? void 0 : _a3.value, (addRecord = {}) => {
+            setTimeout(() => {
+              var _a4, _b3, _c3, _d2, _e2;
+              handleSelectPet({
+                [formId]: (0, import_format.formatAddFormValues)({
+                  clientId: (_b3 = (_a4 = state == null ? void 0 : state.client) == null ? void 0 : _a4.value) == null ? void 0 : _b3.id,
+                  value: [{ ...addRecord, customer: (_c3 = state == null ? void 0 : state.client) == null ? void 0 : _c3.value }],
+                  data_range: (_e2 = (_d2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _d2.holder) == null ? void 0 : _e2.data_range
+                })
+              });
+            }, 200);
+          });
+        }
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__create-form-icon" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__create-form-txt" }, `${import_utils.locales.getText("pisell2.text.create-new")} ${((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.holder) == null ? void 0 : _b2.form) == null ? void 0 : _c2.title) || "-"}`))
+    )), /* @__PURE__ */ import_react.default.createElement(
+      import_pet.default,
+      {
+        clientChangeNotSetPet: true,
+        state,
+        dispatch: petDispatch,
+        hideTitle: true,
+        handleOpenModal,
+        addButtonProps: {
+          onClick: handleOpenClientModal,
+          style: { display: "none" }
+        },
+        previewItemTitleRender
+      }
+    ));
+  }, [
+    isWalkIn,
+    isHasFormRecord,
+    state == null ? void 0 : state.disabledEdit,
+    boardConfig.type,
+    (_t = (_s = (_r = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _r.holder) == null ? void 0 : _s.form) == null ? void 0 : _t.title,
+    (_v = (_u = state.pet) == null ? void 0 : _u.formData) == null ? void 0 : _v[0],
+    state,
+    petDispatch,
+    handleOpenModal,
+    handleOpenClientModal,
+    previewItemTitleRender,
+    handleAddPet,
+    currentPetValue,
+    formId,
+    (_x = (_w = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _w.holder) == null ? void 0 : _x.data_range
+  ]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-vertical-client-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -214,11 +339,11 @@ var VerticalClient = (props) => {
       import_antd.Avatar,
       {
         className: "pisell-lowcode__booking-client-avatar",
-        src: import_utils.image.ali((_n = state.client.value) == null ? void 0 : _n.cover, 100),
+        src: import_utils.image.ali((_y = state.client.value) == null ? void 0 : _y.cover, 100),
         size: 64,
         icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
       }
-    ), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, import_utils.locales.getText("pisell2.text.add-client")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in"))) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, getNickname(state.client.value)), ((_o = state.client.value) == null ? void 0 : _o.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_p = state.client.value) == null ? void 0 : _p.email) : null, ((_q = state.client.value) == null ? void 0 : _q.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_r = state.client.value) == null ? void 0 : _r.phone) : null), !isWalkIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-action-wrap" }, !state.disabledEdit && /* @__PURE__ */ import_react.default.createElement(
+    ), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, import_utils.locales.getText("pisell2.text.add-client")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in"))) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, getNickname(state.client.value)), ((_z = state.client.value) == null ? void 0 : _z.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_A = state.client.value) == null ? void 0 : _A.email) : null, ((_B = state.client.value) == null ? void 0 : _B.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_C = state.client.value) == null ? void 0 : _C.phone) : null), !isWalkIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-action-wrap" }, !state.disabledEdit && /* @__PURE__ */ import_react.default.createElement(
       import_antd.Dropdown.Button,
       {
         menu: {
@@ -239,31 +364,13 @@ var VerticalClient = (props) => {
       },
       import_utils.locales.getText("pisell2.text.view-profile")
     )))
-  ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-vertical-pet" }, !(state == null ? void 0 : state.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, boardConfig.type === "form" ? /* @__PURE__ */ import_react.default.createElement(
-    import_pet.default,
-    {
-      clientChangeNotSetPet: true,
-      state,
-      dispatch: petDispatch,
-      hideTitle: true,
-      handleOpenModal,
-      addButtonProps: {
-        onClick: handleOpenClientModal,
-        style: { display: "none" }
-      },
-      previewItemTitleRender
-    }
-  ) : null) : null), isShowAddBtn && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-vertical-footer" }, /* @__PURE__ */ import_react.default.createElement(
+  ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-vertical-pet" }, petRender), isShowAddBtn && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-vertical-footer" }, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
     {
       onClick: () => {
-        var _a2, _b2;
-        let searchVal = getNickname(state.client.value) || ((_a2 = state.client.value) == null ? void 0 : _a2.email) || ((_b2 = state.client.value) == null ? void 0 : _b2.phone) || "";
-        if (isWalkIn) {
-          searchVal = "";
-        }
-        modalRef.current.setSearch(searchVal);
-        handleOpenClientModal(searchVal);
+        const currentClientSearchValue = getCurrentClientSearchValue();
+        modalRef.current.setSearch(currentClientSearchValue);
+        handleOpenClientModal(currentClientSearchValue);
       },
       block: true,
       size: "large"
@@ -274,7 +381,7 @@ var VerticalClient = (props) => {
     {
       modalOpen: state.modalOpen,
       loading,
-      autoFocus: !((_u = (_t = (_s = context == null ? void 0 : context.appHelper) == null ? void 0 : _s.utils) == null ? void 0 : _t.isTerminal) == null ? void 0 : _u.call(_t)),
+      autoFocus: !((_F = (_E = (_D = context == null ? void 0 : context.appHelper) == null ? void 0 : _D.utils) == null ? void 0 : _E.isTerminal) == null ? void 0 : _F.call(_E)),
       ref: modalRef,
       onClose: handleClose,
       handleSelectClient,
@@ -284,8 +391,8 @@ var VerticalClient = (props) => {
       formData: state.pet.formData,
       searchChange,
       options: renderList,
-      holder: (_v = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _v.holder,
-      client: (_w = state == null ? void 0 : state.client) == null ? void 0 : _w.value,
+      holder: (_G = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _G.holder,
+      client: (_H = state == null ? void 0 : state.client) == null ? void 0 : _H.value,
       loadMore,
       showPet: (boardConfig == null ? void 0 : boardConfig.type) === "form",
       handleAddPet,

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

@@ -80,4 +80,22 @@
   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);
+}
+.pisell-lowcode__create-form-wrap {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  cursor: pointer;
+  padding: 16px;
+  .pisell-lowcode__create-form-icon {
+    font-size: 20px;
+    color: rgb(127, 86, 217);
+  }
+  .pisell-lowcode__create-form-txt {
+    color: #7f56d9;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 24px;
+  }
 }

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

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

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

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   getIsBundleOrCombination: () => getIsBundleOrCombination,
+  moveItemToFront: () => moveItemToFront,
   uniqueByField: () => uniqueByField
 });
 module.exports = __toCommonJS(utils_exports);
@@ -42,8 +43,18 @@ var uniqueByField = (arr, field) => {
     }
   });
 };
+var moveItemToFront = (arr, targetId) => {
+  const index = arr.findIndex((item) => item.id === targetId);
+  if (index !== -1) {
+    const targetItem = arr[index];
+    arr.splice(index, 1);
+    arr.unshift(targetItem);
+  }
+  return arr;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getIsBundleOrCombination,
+  moveItemToFront,
   uniqueByField
 });

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

@@ -160,6 +160,7 @@ declare const _default: {
         "pisell2.text.actions": string;
         "pisell2.text.add-client": string;
         'pisell2.text.variant-client-change': string;
+        'pisell2.text.variant-client-no-data': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -322,6 +323,7 @@ declare const _default: {
         "pisell2.text.actions": string;
         "pisell2.text.add-client": string;
         'pisell2.text.variant-client-change': string;
+        'pisell2.text.variant-client-no-data': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -484,6 +486,7 @@ declare const _default: {
         "pisell2.text.actions": string;
         "pisell2.text.add-client": string;
         'pisell2.text.variant-client-change': string;
+        'pisell2.text.variant-client-no-data': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -192,7 +192,8 @@ var locales_default = {
     "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",
-    "pisell2.text.variant-client-change": "Change"
+    "pisell2.text.variant-client-change": "Change",
+    "pisell2.text.variant-client-no-data": "No record"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -368,7 +369,8 @@ var locales_default = {
     "page.booking.text.unlimited": "无限制",
     "pisell2.text.actions": "操作选项",
     "pisell2.text.add-client": "添加客户",
-    "pisell2.text.variant-client-change": "更改客户"
+    "pisell2.text.variant-client-change": "更改客户",
+    "pisell2.text.variant-client-no-data": "暂无数据"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -544,6 +546,7 @@ var locales_default = {
     "page.booking.text.unlimited": "無限制",
     "pisell2.text.actions": "操作選項",
     "pisell2.text.add-client": "添加客戶",
-    "pisell2.text.variant-client-change": "更改客戶"
+    "pisell2.text.variant-client-change": "更改客戶",
+    "pisell2.text.variant-client-no-data": "暫無數據"
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.94",
+  "version": "3.0.96",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -58,9 +58,9 @@
     "ahooks": "^3.7.6",
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.88",
-    "@pisell/utils": "1.0.27"
+    "@pisell/utils": "1.0.27",
+    "@pisell/date-picker": "1.0.91",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",