@pisell/private-materials 3.0.61 → 3.0.63

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

@@ -0,0 +1,61 @@
+import dayjs from "dayjs";
+export declare const getDurationProps: ({ cacheItem, useStartTime, currentResource, slice, }: any) => {
+    startDate: dayjs.Dayjs;
+    usableTime: any;
+    duration: string | number | {
+        type: string;
+        value: number;
+    };
+    locale: string;
+    slice: any;
+    selectProps: {
+        size: string;
+    };
+};
+/**
+ * @title: 灵活时长选项
+ * @description:
+ * @param {*} useMemo
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-23 10:10
+ */
+export declare const getFlexibleOption: ({ cacheItem, useStartTime, currentResource, slice, durationProps, }: any) => {
+    label: any;
+    value: any;
+} | null;
+/**
+ * @title: 时间切片
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-01-09 13:37
+ */
+export declare const getTimeObj: ({ cacheItem, useStartTime, currentResource, state, useDuration, durationProps, }: any) => {
+    timeSlices: {
+        label: string;
+        value: string;
+    }[];
+    durationSlicesBasedOnTime: {
+        label: string;
+        value: number;
+    }[];
+};
+/**
+ * @title: 获取资源列表
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-01-09 13:38
+ */
+export declare const formatResources: ({ cacheItem, resourcesOrigin }: any) => any[];
+export declare const checkCacheItemResource: ({ cacheItem, resources }: any) => any;
+/**
+ * @title: 预生成服务的 extend
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-06-01 13:25
+ */
+export declare const getProductExtend: ({ cacheItem, state }: any) => any;

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

@@ -0,0 +1,211 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/info/service/addService/utils.tsx
+var utils_exports = {};
+__export(utils_exports, {
+  checkCacheItemResource: () => checkCacheItemResource,
+  formatResources: () => formatResources,
+  getDurationProps: () => getDurationProps,
+  getFlexibleOption: () => getFlexibleOption,
+  getProductExtend: () => getProductExtend,
+  getTimeObj: () => getTimeObj
+});
+module.exports = __toCommonJS(utils_exports);
+var import_react = __toESM(require("react"));
+var import_utils = require("../../../utils");
+var import_dayjs = __toESM(require("dayjs"));
+var import_utils2 = require("@pisell/utils");
+var import_AlertTriangle = __toESM(require("@pisell/icon/es/AlertTriangle"));
+var getDurationProps = ({
+  cacheItem,
+  useStartTime,
+  currentResource,
+  slice
+}) => {
+  var _a;
+  let _cacheItem = cacheItem;
+  return {
+    startDate: (0, import_dayjs.default)(
+      (0, import_dayjs.default)(_cacheItem._extend.start_date).format("YYYY-MM-DD ") + ((0, import_utils.getServeStartTime)(useStartTime) || "00:00")
+    ),
+    usableTime: (_a = currentResource == null ? void 0 : currentResource._extend) == null ? void 0 : _a.usableTime,
+    duration: (0, import_utils.getDuration)(_cacheItem == null ? void 0 : _cacheItem.duration),
+    locale: import_utils2.locales.locale,
+    slice,
+    selectProps: { size: "large" }
+  };
+};
+var getFlexibleOption = ({
+  cacheItem,
+  useStartTime,
+  currentResource,
+  slice,
+  durationProps
+}) => {
+  var _a, _b;
+  const _durationProps = durationProps || getDurationProps({
+    cacheItem,
+    useStartTime,
+    currentResource,
+    slice
+  });
+  let _duration = _durationProps.duration;
+  if (_duration === "flexible") {
+    let endDate = (0, import_utils.getEndDate)(
+      _durationProps.startDate,
+      _duration,
+      ((_a = _durationProps.usableTime) == null ? void 0 : _a.end_at) ? (0, import_dayjs.default)((_b = _durationProps.usableTime) == null ? void 0 : _b.end_at) : null
+    );
+    let timeValue = endDate.diff(_durationProps.startDate, "minute");
+    return {
+      label: import_utils2.locales.getText("pisell2.text.flexible"),
+      value: import_utils.flexibleObj.create(timeValue)
+    };
+  }
+  return null;
+};
+var getTimeObj = ({
+  cacheItem,
+  useStartTime,
+  currentResource,
+  state,
+  useDuration,
+  durationProps
+}) => {
+  var _a, _b, _c;
+  const flexibleOption = getFlexibleOption({
+    cacheItem,
+    useStartTime,
+    currentResource,
+    state,
+    durationProps
+  });
+  let obj = (0, import_utils.sliceDayIntoFiveMinutes)(
+    (_c = (_b = (_a = state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time,
+    import_utils2.locales.locale
+  );
+  let timeSlices = [...obj.timeSlices];
+  let durationSlicesBasedOnTime = [...obj.durationSlicesBasedOnTime];
+  if (flexibleOption) {
+    durationSlicesBasedOnTime.unshift(flexibleOption);
+  }
+  if (useDuration && !durationSlicesBasedOnTime.some((d) => d.value === useDuration)) {
+    durationSlicesBasedOnTime.unshift({
+      label: (0, import_utils.getDiscountTime)(useDuration),
+      value: useDuration,
+      //@ts-ignore
+      disabled: true
+    });
+  }
+  if (useStartTime && useStartTime !== "now" && !timeSlices.some((d) => d.value === useStartTime)) {
+    timeSlices.unshift({
+      label: (0, import_dayjs.default)(useStartTime, "HH:mm").format("hh:mm A"),
+      value: useStartTime
+    });
+  }
+  timeSlices.unshift({
+    label: import_utils2.locales.getText("pisell2.text.now"),
+    value: "now"
+  });
+  return {
+    ...obj,
+    timeSlices,
+    durationSlicesBasedOnTime
+  };
+};
+var formatResources = ({ cacheItem, resourcesOrigin }) => {
+  try {
+    let _list = [...resourcesOrigin];
+    const _cacheItem = cacheItem;
+    _list = _list.map(
+      (d) => (0, import_utils.formatResource)(d, _cacheItem, (item) => {
+        return /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-option" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "like-wrap" }), item.labelText, !item.usable && /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { className: "resource-option-alert-icon" }));
+      })
+    );
+    _list = _list.sort((a, b) => b.usable ? 1 : -1);
+    return _list;
+  } catch (err) {
+    console.log("formatResourcesErr", err);
+  }
+  return [];
+};
+var checkCacheItemResource = ({ cacheItem, resources }) => {
+  let resourceId = cacheItem._extend.resource;
+  if (resourceId || resourceId === 0) {
+    if (!resources.find((d) => d.form_record_id === resourceId)) {
+      resourceId = void 0;
+    }
+  } else {
+    if (cacheItem.new) {
+      if (resources.length === 2) {
+        resourceId = resources[1].form_record_id;
+      }
+      if (resources.length > 2) {
+        const usableList = resources.filter(
+          (d) => d.usable && d.form_id !== 0
+        );
+        if (usableList.length === 1) {
+          resourceId = usableList[0].form_record_id;
+        }
+      }
+    }
+  }
+  return resourceId;
+};
+var getProductExtend = ({ cacheItem, state }) => {
+  const resourcesOrigin = state.service.resourcesOrigin || [];
+  let currentResource = null;
+  if (!cacheItem.new) {
+    const resources2 = formatResources({ cacheItem, resourcesOrigin });
+    let item = resources2.find((d) => d.form_record_id == cacheItem._extend.resource) || {};
+    if (item) {
+      currentResource = item;
+    }
+  }
+  const timeObj = getTimeObj({ cacheItem, currentResource, state });
+  let _extend = (0, import_utils.getServerItemExtend)(state, cacheItem, timeObj);
+  const resources = formatResources({
+    cacheItem: { ...cacheItem, _extend },
+    resourcesOrigin
+  });
+  _extend.resource = checkCacheItemResource({
+    cacheItem: { ...cacheItem, _extend },
+    resources
+  });
+  return _extend;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  checkCacheItemResource,
+  formatResources,
+  getDurationProps,
+  getFlexibleOption,
+  getProductExtend,
+  getTimeObj
+});

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

@@ -34,7 +34,6 @@ __export(editService_exports, {
 module.exports = __toCommonJS(editService_exports);
 var import_react = __toESM(require("react"));
 var import_Delete_wght300_24px = __toESM(require("@pisell/icon/es/Delete_wght300_24px"));
-var import_AlertTriangle = __toESM(require("@pisell/icon/es/AlertTriangle"));
 var import_drawer = __toESM(require("../../../components/drawer"));
 var import_model = require("../../model");
 var import_utils = require("@pisell/utils");
@@ -43,11 +42,11 @@ var import_antd = require("antd");
 var import_index = require("./index.less");
 var import_collapsibleList = __toESM(require("../../../components/collapsibleList"));
 var import_utils2 = require("../../../components/collapsibleList/utils");
-var import_dayjs = __toESM(require("dayjs"));
 var import_ahooks = require("ahooks");
 var import_utils3 = require("../../../utils");
 var import_like = __toESM(require("../like"));
 var import_mock = require("../../../mock");
+var import_utils4 = require("../addService/utils");
 var Info = () => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
   const [form] = import_antd.Form.useForm();
@@ -58,6 +57,7 @@ var Info = () => {
   const useDuration = import_antd.Form.useWatch("duration", form);
   const [resourceLoading, setResourceLoading] = (0, import_react.useState)(false);
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
+  const [selectOpen, setSelectOpen] = (0, import_react.useState)();
   const getCurrentCacheItem = () => {
     let values = form.getFieldsValue();
     let _cacheItem = state.service.cacheItem;
@@ -75,18 +75,14 @@ var Info = () => {
     return item;
   }, [useResource, state.service.resources]);
   const durationProps = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2;
+    var _a2, _b2, _c2;
     let _cacheItem = getCurrentCacheItem();
-    return {
-      startDate: (0, import_dayjs.default)(
-        (0, import_dayjs.default)(_cacheItem._extend.start_date).format("YYYY-MM-DD ") + ((0, import_utils3.getServeStartTime)(useStartTime) || "00:00")
-      ),
-      usableTime: (_a2 = currentResource == null ? void 0 : currentResource._extend) == null ? void 0 : _a2.usableTime,
-      duration: (0, import_utils3.getDuration)(_cacheItem == null ? void 0 : _cacheItem.duration),
-      locale: import_utils.locales.locale,
-      slice: (_d2 = (_c2 = (_b2 = state.bookingConfig) == null ? void 0 : _b2.config) == null ? void 0 : _c2.basic) == null ? void 0 : _d2.service_time,
-      selectProps: { size: "large" }
-    };
+    return (0, import_utils4.getDurationProps)({
+      cacheItem: _cacheItem,
+      useStartTime,
+      currentResource,
+      slice: (_c2 = (_b2 = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.service_time
+    });
   }, [
     currentResource,
     state.service.cacheItem,
@@ -95,56 +91,18 @@ var Info = () => {
     (_c = (_b = (_a = state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.service_time
   ]);
   const flexibleOption = (0, import_react.useMemo)(() => {
-    var _a2, _b2;
-    let _duration = durationProps.duration;
-    if (_duration === "flexible") {
-      let endDate = (0, import_utils3.getEndDate)(
-        durationProps.startDate,
-        _duration,
-        ((_a2 = durationProps.usableTime) == null ? void 0 : _a2.end_at) ? (0, import_dayjs.default)((_b2 = durationProps.usableTime) == null ? void 0 : _b2.end_at) : null
-      );
-      let timeValue = endDate.diff(durationProps.startDate, "minute");
-      return {
-        label: import_utils.locales.getText("pisell2.text.flexible"),
-        value: import_utils3.flexibleObj.create(timeValue)
-      };
-    }
-    return null;
+    return (0, import_utils4.getFlexibleOption)({
+      durationProps
+    });
   }, [durationProps, import_utils.locales.locale]);
   const timeObj = (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2;
-    let obj = (0, import_utils3.sliceDayIntoFiveMinutes)(
-      (_c2 = (_b2 = (_a2 = state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.service_time,
-      import_utils.locales.locale
-    );
-    let timeSlices = [...obj.timeSlices];
-    let durationSlicesBasedOnTime = [...obj.durationSlicesBasedOnTime];
-    if (flexibleOption) {
-      durationSlicesBasedOnTime.unshift(flexibleOption);
-    }
-    if (useDuration && !durationSlicesBasedOnTime.some((d) => d.value === useDuration)) {
-      durationSlicesBasedOnTime.unshift({
-        label: (0, import_utils3.getDiscountTime)(useDuration),
-        value: useDuration,
-        //@ts-ignore
-        disabled: true
-      });
-    }
-    if (useStartTime && useStartTime !== "now" && !timeSlices.some((d) => d.value === useStartTime)) {
-      timeSlices.unshift({
-        label: (0, import_dayjs.default)(useStartTime, "HH:mm").format("hh:mm A"),
-        value: useStartTime
-      });
-    }
-    timeSlices.unshift({
-      label: import_utils.locales.getText("pisell2.text.now"),
-      value: "now"
+    return (0, import_utils4.getTimeObj)({
+      durationProps,
+      useStartTime,
+      currentResource,
+      state,
+      useDuration
     });
-    return {
-      ...obj,
-      timeSlices,
-      durationSlicesBasedOnTime
-    };
   }, [state, import_utils.locales.locale, useDuration, useStartTime, flexibleOption]);
   (0, import_react.useEffect)(() => {
     try {
@@ -159,56 +117,38 @@ var Info = () => {
     }
   }, [useDuration, flexibleOption]);
   const getResources = async (cacheItem) => {
+    var _a2;
     try {
-      setResourceLoading(true);
-      let data = await state.apis.getResources({
-        skip: 1,
-        num: 1e3,
-        with_date_times: state.date.value.format("YYYY-MM-DD"),
-        codes: ["resources", "therapist", "table"],
-        _config: { abort: true }
-      });
-      let _list = [(0, import_mock.getNoResource)()].concat((data == null ? void 0 : data.list) || []);
+      let _list = state.service.resourcesOrigin || [];
+      let autoClose = (_a2 = state.service.cacheItem) == null ? void 0 : _a2.autoClose;
       const _cacheItem = cacheItem || getCurrentCacheItem();
       if (!_cacheItem._extend) {
         return;
       }
-      _list = _list.map(
-        (d) => (0, import_utils3.formatResource)(d, _cacheItem, (item) => {
-          return /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-option" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "like-wrap" }), item.labelText, !item.usable && /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { className: "resource-option-alert-icon" }));
-        })
-      );
-      _list = _list.sort((a, b) => b.usable ? 1 : -1);
-      if (useResource) {
-        if (!_list.find((d) => d.form_record_id === useResource)) {
-          form.setFieldsValue({
-            resource: 0
-          });
-        }
-      } else {
-        let _useResource = 0;
-        if (_list.length === 2 && useResource !== 0) {
-          _useResource = _list[1].form_record_id;
-        }
-        form.setFieldsValue({
-          resource: _useResource
-        });
-      }
       dispatch({
         type: "setService",
         payload: {
-          resources: _list
+          resources: (0, import_utils4.formatResources)({
+            cacheItem: _cacheItem,
+            resourcesOrigin: _list
+          })
         }
       });
-      setTimeout(() => {
-        var _a2;
-        if (((_a2 = state.service.cacheItem) == null ? void 0 : _a2.autoClose) || _list.length === 1 && useResource === 0) {
-          form.submit();
+      if (_cacheItem.new) {
+        if (autoClose) {
+          setTimeout(() => {
+            form.submit();
+          }, 200);
+        } else {
+          setTimeout(() => {
+            if (selectOpen === void 0) {
+              setSelectOpen(true);
+            }
+          }, 500);
         }
-      }, 200);
+      }
     } catch (err) {
     }
-    setResourceLoading(false);
   };
   const handleDeleteProduct = () => {
     var _a2;
@@ -316,12 +256,13 @@ var Info = () => {
   const setEditData = (0, import_ahooks.useMemoizedFn)(() => {
     if (state.service.editModal) {
       let cacheItem = state.service.cacheItem;
-      let values = (0, import_utils3.getServerItemExtend)(state, cacheItem, timeObj);
+      let values = cacheItem._extend;
       form.setFieldsValue(values);
       if (state.renderType !== "eventBooking") {
         getResources();
       }
     } else {
+      setSelectOpen(void 0);
       form.resetFields();
     }
   });
@@ -338,7 +279,12 @@ var Info = () => {
     if (useStartTime && useDuration && state.renderType !== "eventBooking") {
       getResources();
     }
-  }, [useStartTime, useDuration, state.renderType]);
+  }, [
+    useStartTime,
+    useDuration,
+    state.renderType,
+    state.service.resourcesOrigin
+  ]);
   (0, import_react.useEffect)(() => {
     setEditData();
   }, [state.service.editModal, setEditData]);
@@ -364,6 +310,27 @@ var Info = () => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
   }, [(_i = (_h = (_g = (_f = state.service) == null ? void 0 : _f.cacheItem) == null ? void 0 : _g._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.bundle]);
+  const getResourcesData = async () => {
+    setResourceLoading(true);
+    let data = await state.apis.getResources({
+      skip: 1,
+      num: 1e3,
+      with_date_times: state.date.value.format("YYYY-MM-DD"),
+      codes: ["resources", "therapist", "table"],
+      _config: { abort: true }
+    });
+    let _list = [(0, import_mock.getNoResource)()].concat((data == null ? void 0 : data.list) || []);
+    dispatch({
+      type: "setService",
+      payload: {
+        resourcesOrigin: _list
+      }
+    });
+    setResourceLoading(false);
+  };
+  (0, import_react.useEffect)(() => {
+    getResourcesData();
+  }, [state.date.value]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
@@ -507,6 +474,8 @@ var Info = () => {
             size: "large",
             allowClear: true,
             showSearch: true,
+            open: selectOpen,
+            onDropdownVisibleChange: setSelectOpen,
             filterOption: (str, option) => {
               return (option.labelText || "").toLowerCase().includes((str || "").toLowerCase());
             }

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

@@ -34,6 +34,7 @@ export interface FormState {
         editModal: boolean;
         services: any[];
         resources: any[];
+        resourcesOrigin: any[];
         value: any[];
         cacheItem: any;
         edit: boolean;

package/package.json

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