@pisell/private-materials 3.0.49 → 3.0.51

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

@@ -13,5 +13,5 @@ export interface InfoProps {
     setGlobalState: any;
 }
 export declare const formatProducts: (values: any) => any;
-declare const Addons: (props: any) => JSX.Element;
+declare const Addons: (props: any) => any;
 export default Addons;

package/lib/components/booking/addons/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -106,6 +106,9 @@ var CustomSelect = (props, ref) => {
     if (disabled) {
       return;
     }
+    if (addButtonProps == null ? void 0 : addButtonProps.addCallback) {
+      addButtonProps == null ? void 0 : addButtonProps.addCallback();
+    }
     setOpen(true);
     initValue();
     if (autoFocus) {
@@ -232,9 +235,6 @@ var CustomSelect = (props, ref) => {
       showSub: isMore,
       ...addButtonProps,
       onClick: () => {
-        if (addButtonProps.addCallback) {
-          addButtonProps == null ? void 0 : addButtonProps.addCallback();
-        }
         if (addButtonProps.onClick) {
           addButtonProps.onClick();
           return;

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

@@ -21,5 +21,5 @@ export interface InfoProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:10
  */
-declare const Forms: (props: any) => JSX.Element;
+declare const Forms: (props: any) => any;
 export default Forms;

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

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Forms: (props: any) => JSX.Element;
+declare const Forms: (props: any) => any;
 export default Forms;

package/lib/components/booking/forms/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/booking/forms/single/index.js

@@ -163,7 +163,8 @@ var Single = ({
       name: ((_a = form.form) == null ? void 0 : _a.title) || "-",
       addButtonProps: _addButtonProps,
       drawerProps: {
-        title: `${import_utils.locales.getText("pisell2.text.select")} ${((_b = form.form) == null ? void 0 : _b.title) || "-"}`
+        title: `${import_utils.locales.getText("pisell2.text.select")} ${((_b = form.form) == null ? void 0 : _b.title) || "-"}`,
+        destroyOnClose: true
       },
       optionRender: _optionRender,
       rowKey: "form_record_id",

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

@@ -1,2 +1,2 @@
-declare const Booking: (props: any) => JSX.Element;
+declare const Booking: (props: any) => any;
 export default Booking;

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

@@ -8,5 +8,5 @@ export interface InfoProps {
     slot: any;
     setState: any;
 }
-declare const Info: (props: any) => JSX.Element;
+declare const Info: (props: any) => any;
 export default Info;

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

@@ -1,9 +1,10 @@
+/// <reference types="react" />
 import { FormState } from "../model";
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -42,36 +42,66 @@ var import_forms = __toESM(require("../../forms/forms"));
 var import_format = require("../../forms/format");
 var import_utils2 = require("../../utils");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var defaultParams = {
+  skip: 1,
+  num: 100,
+  total: 0,
+  keyword: ""
+};
 var Pet = () => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  const [loadLoading, setLoadLoading] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [valueLoading, setValueLoading] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
   const { isTerminal } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
-  const params = (0, import_react.useMemo)(() => {
+  const [params, setParams] = (0, import_react.useState)(defaultParams);
+  const boardParams = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
   }, [(_d = (_c = (_b = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.appointment_subject]);
   const petForm = (0, import_react.useMemo)(() => {
-    return (state.pet.formData || [])[0];
-  }, [state.pet.formData]);
-  const getFormData = async ({ formData }) => {
+    var _a2;
+    let _holder = (_a2 = state.bookingConfig) == null ? void 0 : _a2.holder;
+    if (!_holder) {
+      return null;
+    }
+    return {
+      ..._holder,
+      ..._holder == null ? void 0 : _holder.form,
+      options: [],
+      form_id: _holder.form.id,
+      field: _holder.form.form_field,
+      relation_type: "appointment_booking",
+      form_record: []
+    };
+  }, [(_e = state.bookingConfig) == null ? void 0 : _e.holder]);
+  const getFormData = async ({ formData }, _params = defaultParams) => {
     var _a2, _b2, _c2, _d2;
     setLoading(true);
     let _list = [];
     const noClient = formData.data_range === "customer" && (0, import_utils2.isWalkIn)((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id);
     if (!noClient) {
-      let _params = {
-        form_id: params.form_id,
-        skip: 1,
-        num: 999
+      let _values = {
+        form_id: boardParams.form_id,
+        ..._params
       };
       if (formData.data_range === "customer") {
-        _params.customer_id = (_d2 = (_c2 = state.client) == null ? void 0 : _c2.value) == null ? void 0 : _d2.id;
+        _values.customer_id = (_d2 = (_c2 = state.client) == null ? void 0 : _c2.value) == null ? void 0 : _d2.id;
+      }
+      const data = await state.apis.getPetsData(_values);
+      _list = [...formData.options];
+      if (_params.skip === 1) {
+        _list = (data == null ? void 0 : data.list) || [];
+      } else {
+        _list = _list.concat((data == null ? void 0 : data.list) || []);
       }
-      const data = await state.apis.getPetsData(_params);
-      _list = (data == null ? void 0 : data.list) || [];
+      setParams({
+        ...params,
+        ..._params,
+        total: (data == null ? void 0 : data.count) || 0
+      });
     }
     dispatch({
       type: "setPet",
@@ -88,36 +118,42 @@ var Pet = () => {
     setLoading(false);
   };
   const getForms = async (isUpdateValue = true) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
     let values = {
       ...state.pet.value
     };
-    let isSetValue = isUpdateValue && values[params == null ? void 0 : params.form_id] === void 0;
+    let isSetValue = isUpdateValue && values[boardParams == null ? void 0 : boardParams.form_id] === void 0 && ((_c2 = (_b2 = (_a2 = state.bookingDetail) == null ? void 0 : _a2.holder) == null ? void 0 : _b2.form_record) == null ? void 0 : _c2.length);
     if (isSetValue) {
       setValueLoading(true);
     }
     try {
-      let formData = await state.apis.getForms({
-        relation_type: state.renderType === "eventBooking" ? "event_booking_v2" : "appointment_booking",
-        relation_id: ((_b2 = (_a2 = state.bookingDetail) == null ? void 0 : _a2.bookings) == null ? void 0 : _b2.id) || 0
-        // _config: { useCache: true },
-      });
-      formData = (formData || []).filter(
-        (d) => d.form_id === (params == null ? void 0 : params.form_id)
-      )[0];
+      let formData = petForm;
+      if (state.renderType === "eventBooking") {
+        formData = await state.apis.getForms({
+          relation_type: "event_booking_v2",
+          relation_id: ((_e2 = (_d2 = state.bookingDetail) == null ? void 0 : _d2.bookings) == null ? void 0 : _e2.id) || 0
+          // _config: { useCache: true },
+        });
+        formData = (formData || []).filter(
+          (d) => d.form_id === (params == null ? void 0 : params.form_id)
+        )[0];
+        formData = {
+          ...formData,
+          ...formData.form,
+          form_id: formData.form.id,
+          options: [],
+          type: formData.type
+        };
+      }
       let payload = {
-        formData: [
-          {
-            ...formData,
-            ...formData.form,
-            form_id: formData.form.id,
-            options: [],
-            type: formData.type
-          }
-        ]
+        formData: [formData]
       };
       if (isSetValue) {
-        values[params == null ? void 0 : params.form_id] = formData.form_record;
+        let records = await state.apis.getFormRecords({
+          form_record_ids: (_g2 = (_f2 = state.bookingDetail) == null ? void 0 : _f2.holder) == null ? void 0 : _g2.form_record
+        });
+        console.log("records", records);
+        values[boardParams == null ? void 0 : boardParams.form_id] = records;
         payload.value = values;
         setValueLoading(false);
       }
@@ -163,7 +199,7 @@ var Pet = () => {
             [petForm.form_id]: cur
           }
         });
-        getForms();
+        addCallback();
       }
     });
   };
@@ -180,7 +216,7 @@ var Pet = () => {
       type: "pisell1.editCustomFormRecord",
       data: _data,
       callback: () => {
-        getForms();
+        addCallback();
       }
     });
   };
@@ -200,34 +236,67 @@ var Pet = () => {
       clientId: (_c2 = (_b2 = state.client) == null ? void 0 : _b2.value) == null ? void 0 : _c2.id,
       forms: ((_d2 = state.pet) == null ? void 0 : _d2.formData) || []
     });
-    dispatch({
-      type: "setPet",
-      payload: { value: changeFormValuesData }
+    setTimeout(() => {
+      dispatch({
+        type: "setPet",
+        payload: { value: changeFormValuesData }
+      });
     });
-  }, [(_e = state.client.value) == null ? void 0 : _e.id]);
-  (0, import_react.useEffect)(() => {
+  }, [(_f = state.client.value) == null ? void 0 : _f.id]);
+  const handleUpdateForm = () => {
     if (state.bookingId) {
       if (!state.bookingDetail) {
         return;
       }
     }
-    if (params.form_id && params.type === "form") {
+    if (boardParams.form_id && boardParams.type === "form") {
       getForms(true);
     }
+  };
+  (0, import_react.useEffect)(() => {
+    setTimeout(() => {
+      handleUpdateForm();
+    }, 10);
   }, [
     state.bookingId,
     state.bookingDetail,
-    params.form_id,
-    params.type,
-    (_g = (_f = state.client) == null ? void 0 : _f.value) == null ? void 0 : _g.id
+    boardParams.form_id,
+    boardParams.type,
+    (_h = (_g = state.client) == null ? void 0 : _g.value) == null ? void 0 : _h.id,
+    state.renderType,
+    petForm
   ]);
-  const addCallback = () => {
+  const addCallback = (_params) => {
     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 });
-    }
+    getFormData({ formData: _formData }, _params);
+  };
+  const searchChange = (keyword) => {
+    let _params = {
+      ...params,
+      skip: 1,
+      keyword
+    };
+    addCallback(_params);
   };
+  const loadMore = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2, _d2;
+    const show = ((_d2 = (_c2 = (_b2 = (_a2 = state.pet) == null ? void 0 : _a2.formData) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.options) == null ? void 0 : _d2.length) < params.total || 0;
+    return show ? /* @__PURE__ */ import_react.default.createElement("div", { className: "", style: { textAlign: "center", padding: "16px 0" } }, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        loading: loadLoading,
+        onClick: () => {
+          let _params = {
+            ...params,
+            skip: params.skip + 1
+          };
+          addCallback(_params);
+        }
+      },
+      import_utils.locales.getText("pisell2.text.load-more")
+    )) : null;
+  }, [loadLoading, params, (_l = (_k = (_j = (_i = state.pet) == null ? void 0 : _i.formData) == null ? void 0 : _j[0]) == null ? void 0 : _k.options) == null ? void 0 : _l.length]);
   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,
     {
@@ -242,13 +311,22 @@ var Pet = () => {
       modalOpen: state.modalOpen,
       value: state.pet.value,
       onChange: onValueChange,
-      client: (_h = state.client) == null ? void 0 : _h.value,
+      client: (_m = state.client) == null ? void 0 : _m.value,
       customSelectProps: {
         loading,
         handleViewItem,
         virtualListHeight: window.innerHeight - 213 - 57 - 16,
         disabled: state.disabledEdit,
-        autoFocus: !state.isTerminal
+        autoFocus: !state.isTerminal,
+        closeCallback: () => {
+          searchChange("");
+        },
+        searchChange,
+        searchValue: params.search,
+        loadMore,
+        filterItem: () => {
+          return true;
+        }
       },
       optionRender: (item) => {
         return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -88,7 +89,7 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => JSX.Element;
+declare const Notes: (props: any) => any;
 export default Notes;

package/lib/components/booking/notes/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => JSX.Element;
+declare const Payments: (props: any) => any;
 export default Payments;

package/lib/components/booking/payments/model.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/lib/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => JSX.Element;
+declare const Schedules: (props: any) => any;
 export default Schedules;

package/lib/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,7 +69,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.49",
+  "version": "3.0.51",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -58,8 +58,8 @@
     "ahooks": "^3.7.6",
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
-    "@pisell/utils": "1.0.24",
     "@pisell/icon": "0.0.8",
+    "@pisell/utils": "1.0.24",
     "@pisell/date-picker": "1.0.69"
   },
   "peerDependencies": {