@pisell/private-materials 3.0.37 → 3.0.38

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

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

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

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

@@ -116,7 +116,10 @@ var Info = () => {
       ids: state.renderType === "eventBooking" ? (_a2 = state.eventOtherParams) == null ? void 0 : _a2.productIds : void 0,
       open_quotation: 1,
       with_schedule: 1,
-      with_count: ["bundleGroup", "optionGroup"]
+      with_count: ["bundleGroup", "optionGroup"],
+      _config: {
+        useCache: true
+      }
     });
     setLoading(false);
     setDefaultService(data == null ? void 0 : data.list);
@@ -128,6 +131,7 @@ var Info = () => {
     });
   };
   const handleSelectService = () => {
+    getServices();
     setSearch("");
     dispatch({
       type: "setService",
@@ -200,12 +204,8 @@ var Info = () => {
   const isService = (0, import_react.useMemo)(() => {
     return state.service.value.length > 0;
   }, [state.service.value]);
-  (0, import_react.useEffect)(() => {
-    getServices();
-  }, []);
   (0, import_react.useEffect)(() => {
     if (state.modalOpen) {
-      getServices();
     }
   }, [state.modalOpen]);
   const showAddButton = (0, import_react.useMemo)(() => {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -87,7 +86,7 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, 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) => any;
+declare const Notes: (props: any) => JSX.Element;
 export default Notes;

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, 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) => any;
+declare const Payments: (props: any) => JSX.Element;
 export default Payments;

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, 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) => any;
+declare const Schedules: (props: any) => JSX.Element;
 export default Schedules;

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.37",
+  "version": "3.0.38",
   "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.8",
     "@pisell/utils": "1.0.24",
-    "@pisell/date-picker": "1.0.69"
+    "@pisell/date-picker": "1.0.69",
+    "@pisell/icon": "0.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",