@pisell/private-materials 3.0.154 → 3.0.156

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

@@ -244,7 +244,8 @@ var Info = ({ onEdit }) => {
   }, [search, (_a = state.service) == null ? void 0 : _a.services]);
   console.log("state.service.renderList", renderList);
   const isService = (0, import_react.useMemo)(() => {
-    return state.service.value.length > 0;
+    var _a2, _b2;
+    return ((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) > 0;
   }, [state.service.value]);
   (0, import_react.useEffect)(() => {
     var _a2, _b2, _c2, _d2, _e, _f, _g;
@@ -307,6 +308,7 @@ var Info = ({ onEdit }) => {
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2.autoClose) && /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, round: true }), addButton, /* @__PURE__ */ import_react.default.createElement(
       import_drawer.default,
       {
+        titleNoWrap: true,
         open: state.service.addModal,
         title: import_utils4.locales.getText("pisell2.text.select-service"),
         rootClassName: "booking-server-wrap",

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

@@ -453,6 +453,7 @@ var AddTimeModal = () => {
     return /* @__PURE__ */ import_react.default.createElement(
       import_drawer.default,
       {
+        titleNoWrap: true,
         open: state.service.addTimeModal,
         title: import_utils.locales.getText("page.booking.text.add-time"),
         rootClassName: "booking-server-wrap",

package/lib/components/booking/info/service/addTimeModal/index.less

@@ -20,7 +20,7 @@
     margin: 10px 0;
     flex: 0 0 100%;
     position: sticky;
-    top: 95px;
+    top: 58px !important;
     z-index: 1;
   }
 

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

@@ -49,7 +49,7 @@ var import_mock = require("../../../mock");
 var import_utils4 = require("../addService/utils");
 var submitLock = false;
 var Info = (_, ref) => {
-  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;
+  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;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useLikeStatus = import_antd.Form.useWatch("like_status", form);
@@ -346,7 +346,7 @@ var Info = (_, ref) => {
     setTimeout(() => {
       getResourcesData();
     }, 20);
-  }, [state.date.value]);
+  }, [(_q = (_p = (_o = state.date) == null ? void 0 : _o.value) == null ? void 0 : _p.format) == null ? void 0 : _q.call(_p, "YYYY-MM-DD")]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
@@ -412,12 +412,13 @@ var Info = (_, ref) => {
       init: setEditData
     };
   });
-  const SelectTime = (_o = window.BaseMaterials) == null ? void 0 : _o.SelectTime;
+  const SelectTime = (_r = window.BaseMaterials) == null ? void 0 : _r.SelectTime;
   return (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2;
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
       import_drawer.default,
       {
+        titleNoWrap: true,
         zIndex: state.service.changeService ? 999 : 1e3,
         forceRender: true,
         open: state.service.editModal && !((_a2 = state.service.cacheItem) == null ? void 0 : _a2.autoClose),
@@ -599,17 +600,17 @@ var Info = (_, ref) => {
   }, [
     state.service.changeService,
     state.service.editModal,
-    (_p = state.service.cacheItem) == null ? void 0 : _p.autoClose,
+    (_s = state.service.cacheItem) == null ? void 0 : _s.autoClose,
     import_utils.locales,
-    (_s = (_r = (_q = state.service) == null ? void 0 : _q.cacheItem) == null ? void 0 : _r._extend) == null ? void 0 : _s.product_name,
+    (_v = (_u = (_t = state.service) == null ? void 0 : _t.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.product_name,
     bundles,
     state.amountSymbol,
     state.channelDisabledEdit,
-    (_u = (_t = state.service.cacheItem) == null ? void 0 : _t._extend) == null ? void 0 : _u.origin_total,
+    (_x = (_w = state.service.cacheItem) == null ? void 0 : _w._extend) == null ? void 0 : _x.origin_total,
     isDiscount,
     isReason,
     state.renderType,
-    (_y = (_x = (_w = (_v = state.bookingConfig) == null ? void 0 : _v.config) == null ? void 0 : _w.basic) == null ? void 0 : _x.service_time) == null ? void 0 : _y.value,
+    (_B = (_A = (_z = (_y = state.bookingConfig) == null ? void 0 : _y.config) == null ? void 0 : _z.basic) == null ? void 0 : _A.service_time) == null ? void 0 : _B.value,
     SelectTime,
     durationProps,
     timeObj,

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

@@ -40,6 +40,7 @@ var import_mock = require("../../../mock");
 var import_utils2 = require("../../../utils");
 var import_serviceItem = __toESM(require("../serviceItem"));
 var ServiceList = ({ onEdit }) => {
+  var _a, _b;
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const errorTypes = {
     product: import_utils.locales.getText("pisell2.text.status.service-error-1"),
@@ -108,9 +109,9 @@ var ServiceList = ({ onEdit }) => {
       }
     });
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, state.service.value.map((d) => {
-    var _a;
-    const resourceItem = getResourceItem((_a = d._extend) == null ? void 0 : _a.resource);
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, (_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.map((d) => {
+    var _a2;
+    const resourceItem = getResourceItem((_a2 = d._extend) == null ? void 0 : _a2.resource);
     let errorMessage = getErrorMessage(d, resourceItem);
     return /* @__PURE__ */ import_react.default.createElement(
       import_serviceItem.default,

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

@@ -83,7 +83,7 @@ var isBooking4Shop = (shopId, renderType) => {
   if (renderType === "eventBooking") {
     return false;
   }
-  const booking4Shops = [1350, 1401, 3013, 7154, 7572];
+  const booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007];
   return booking4Shops.includes(shopId);
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -52,6 +52,7 @@ var import_date2 = require("../info/date");
 var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var import_notes = __toESM(require("../info/notes"));
 var import_info = require("../info/index.less");
+var import_antd = require("antd");
 var defaultModules = {
   client: 1,
   date: 1,
@@ -196,7 +197,19 @@ var Info = (0, import_model.Provider)((props) => {
       },
       bodyClassName: "booking-info-warp"
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_l = modal.state) == null ? void 0 : _l.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, modules.service ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, modal.state.date.value ? /* @__PURE__ */ import_react.default.createElement(import_service.default, null) : null) : null, notes, slot ? slot : null)
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_l = modal.state) == null ? void 0 : _l.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Skeleton,
+      {
+        loading: globalState.loading,
+        round: true,
+        active: true,
+        avatar: false,
+        style: { paddingTop: 20 }
+      },
+      modules.service ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, modal.state.date.value ? /* @__PURE__ */ import_react.default.createElement(import_service.default, null) : null) : null,
+      notes,
+      slot ? slot : null
+    ))
   ) : null);
 });
 var info2_default = Info;

package/lib/components/booking/info2/utilsByBooking.js

@@ -129,7 +129,7 @@ var formatTimes = (resourceItem, cacheItem) => {
   if (_resourceItem.capacity >= sum) {
     _resourceItem.times = _resourceItem.times.map((time) => {
       let _time2 = getResourceTimeIsUsable(time, cacheItem, _resourceItem);
-      if (_time2 == null ? void 0 : _time2._extend.isUsable) {
+      if (_time2 == null ? void 0 : _time2._extend.isDateRange) {
         usableTimes.push(_time2);
       }
       return _time2;
@@ -166,7 +166,6 @@ var getErrorList = (resource, cacheItem) => {
       endText = import_utils.locales.getText("pisell1.text.tomorrow") + endText;
     }
     const isSingle = ((_c = (_b = (_a = cacheItem == null ? void 0 : cacheItem._data) == null ? void 0 : _a.resourceMaps) == null ? void 0 : _b[resource == null ? void 0 : resource.form_id]) == null ? void 0 : _c.type) === "single";
-    console.log("resourceresource", resource, cacheItem);
     if (!((_d = resource._extend) == null ? void 0 : _d.usableTime)) {
       if (isSingle) {
         list.push({

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

@@ -3,6 +3,7 @@ export interface FormState {
     amountSymbol: string;
     apis: {
         getClients: (par?: any) => any;
+        getClientsEs: (par?: any) => any;
         getServices: (par?: any) => any;
         getResources: (par?: any) => any;
         getProducts: (par?: any) => any;
@@ -92,6 +93,7 @@ export interface FormState {
     disableEventBookingEdit?: boolean;
     /** 关闭自动打开选择服务弹窗 */
     closeAutoOpenService?: boolean;
+    loading: boolean;
 }
 export declare const walkInData: {
     id: number;

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: any;
+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/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.154",
+  "version": "3.0.156",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "1.0.42",
     "@pisell/materials": "3.0.48",
-    "@pisell/date-picker": "1.0.100",
-    "@pisell/icon": "0.0.11"
+    "@pisell/utils": "1.0.42",
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "1.0.100"
   },
   "peerDependencies": {
     "react": "^18.0.0",