@pisell/private-materials 3.0.62 → 3.0.63

package/es/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) => any;
+declare const Addons: (props: any) => JSX.Element;
 export default Addons;

package/es/components/booking/addons/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/es/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) => any;
+declare const Forms: (props: any) => JSX.Element;
 export default Forms;

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

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

package/es/components/booking/forms/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/es/components/booking/index.d.ts

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

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

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

package/es/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/es/components/booking/info/service/addService/index.js

@@ -28,18 +28,13 @@ import "./index.less";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../serve";
 import { getIsBundleOrCombination } from "../../utils";
-import { formatProductListByCategory, getProductTotalPrice, request, getCacheParams, deleteCacheParams } from "../../../utils";
+import { getProductExtend } from "./utils";
+import { formatProductListByCategory, getProductTotalPrice, request } from "../../../utils";
 import { locales, getUniqueId } from "@pisell/utils";
 import { useUpdateEffect } from "ahooks";
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303];
-var getCacheResourceId = function getCacheResourceId() {
-  var serviceParams = getCacheParams();
-  var resId = Number(serviceParams === null || serviceParams === void 0 ? void 0 : serviceParams.resource_id);
-  console.log("resIdresIdresId", resId);
-  return resId;
-};
 var Info = function Info() {
-  var _state$service2, _state$service3, _state$service3$cache;
+  var _state$service3, _state$service4, _state$service4$cache;
   var _useState = useState(""),
     _useState2 = _slicedToArray(_useState, 2),
     search = _useState2[0],
@@ -147,43 +142,15 @@ var Info = function Info() {
       return _ref.apply(this, arguments);
     };
   }();
-
-  /**
-   * @title: 如果选择了资源, 则直接添加商品
-   * @description:
-   * @param {any} cacheItem
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-05-14 14:02
-   */
-  var autoAddProduct = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(cacheItem) {
-      var resId, _cacheItem;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            resId = getCacheResourceId();
-            _cacheItem = _objectSpread({}, cacheItem);
-            deleteCacheParams();
-          case 3:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function autoAddProduct(_x3) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
   var getServices = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _state$eventOtherPara;
       var data;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             setLoading(true);
-            _context3.next = 3;
+            _context2.next = 3;
             return state.apis.getServices({
               skip: 1,
               num: 500,
@@ -198,7 +165,7 @@ var Info = function Info() {
               }
             });
           case 3:
-            data = _context3.sent;
+            data = _context2.sent;
             setLoading(false);
 
             // 只有自动获取列表的时候才设置商品, 手动点击添加按钮的时候不设置
@@ -213,12 +180,12 @@ var Info = function Info() {
             });
           case 7:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3);
+      }, _callee2);
     }));
     return function getServices() {
-      return _ref3.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var handleSelectService = function handleSelectService() {
@@ -252,6 +219,7 @@ var Info = function Info() {
         is_eject: isEject ? 1 : 0
       },
       callback: function callback(e) {
+        var _state$service;
         var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
           product_id: item.id,
           _id: getUniqueId(),
@@ -276,15 +244,11 @@ var Info = function Info() {
           cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
           cacheItem.new = 0;
         }
-        console.log("_total", cacheItem);
-
-        // 如果已经有资源id,则不跳转详情页, 直接返回
-        // if (getCacheResourceId()) {
-        // 	autoAddProduct(cacheItem);
-        // 	return;
-        // }
-        var resId = getCacheResourceId();
-        cacheItem.autoClose = !!resId;
+        cacheItem._extend = getProductExtend({
+          cacheItem: cacheItem,
+          state: state
+        });
+        cacheItem.autoClose = cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || []).length === 1;
         dispatch({
           type: "setService",
           payload: {
@@ -296,16 +260,17 @@ var Info = function Info() {
       }
     });
   };
+  console.log("state.service.cacheItem", state.service.cacheItem);
   var renderList = useMemo(function () {
-    var _state$service;
-    var _list = ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.services) || [];
+    var _state$service2;
+    var _list = ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services) || [];
     var isIncludes = function isIncludes(str) {
       return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
     };
     return formatProductListByCategory(_list, search ? function (item) {
       return isIncludes(item.title);
     } : undefined);
-  }, [search, (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services]);
+  }, [search, (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.services]);
   var isService = useMemo(function () {
     return state.service.value.length > 0;
   }, [state.service.value]);
@@ -360,7 +325,7 @@ var Info = function Info() {
       }
     });
   }, [state.renderType, showAddButton, isService, state.service.value, loading]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : (_state$service3$cache = _state$service3.cacheItem) === null || _state$service3$cache === void 0 ? void 0 : _state$service3$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$cache = _state$service4.cacheItem) === null || _state$service4$cache === void 0 ? void 0 : _state$service4$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
     loading: true,
     active: true,
     round: true

package/es/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/es/components/booking/info/service/addService/utils.js

@@ -0,0 +1,256 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import React from "react";
+import { getServeStartTime, getDuration, getEndDate, flexibleObj, sliceDayIntoFiveMinutes, getDiscountTime, getServerItemExtend, formatResource } from "../../../utils";
+import dayjs from "dayjs";
+import { locales } from "@pisell/utils";
+import AlertTriangle from "@pisell/icon/es/AlertTriangle";
+export var getDurationProps = function getDurationProps(_ref) {
+  var _currentResource$_ext;
+  var cacheItem = _ref.cacheItem,
+    useStartTime = _ref.useStartTime,
+    currentResource = _ref.currentResource,
+    slice = _ref.slice;
+  var _cacheItem = cacheItem;
+  return {
+    startDate: dayjs(dayjs(_cacheItem._extend.start_date).format("YYYY-MM-DD ") + (getServeStartTime(useStartTime) || "00:00")),
+    usableTime: currentResource === null || currentResource === void 0 ? void 0 : (_currentResource$_ext = currentResource._extend) === null || _currentResource$_ext === void 0 ? void 0 : _currentResource$_ext.usableTime,
+    duration: getDuration(_cacheItem === null || _cacheItem === void 0 ? void 0 : _cacheItem.duration),
+    locale: locales.locale,
+    slice: slice,
+    selectProps: {
+      size: "large"
+    }
+  };
+};
+
+/**
+ * @title: 灵活时长选项
+ * @description:
+ * @param {*} useMemo
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-23 10:10
+ */
+export var getFlexibleOption = function getFlexibleOption(_ref2) {
+  var cacheItem = _ref2.cacheItem,
+    useStartTime = _ref2.useStartTime,
+    currentResource = _ref2.currentResource,
+    slice = _ref2.slice,
+    durationProps = _ref2.durationProps;
+  var _durationProps = durationProps || getDurationProps({
+    cacheItem: cacheItem,
+    useStartTime: useStartTime,
+    currentResource: currentResource,
+    slice: slice
+  });
+  var _duration = _durationProps.duration;
+  if (_duration === "flexible") {
+    var _durationProps$usable, _durationProps$usable2;
+    // 获取结束时间
+    var endDate = getEndDate(_durationProps.startDate, _duration, (_durationProps$usable = _durationProps.usableTime) !== null && _durationProps$usable !== void 0 && _durationProps$usable.end_at ? dayjs((_durationProps$usable2 = _durationProps.usableTime) === null || _durationProps$usable2 === void 0 ? void 0 : _durationProps$usable2.end_at) : null);
+    // 转换为分钟
+    var timeValue = endDate.diff(_durationProps.startDate, "minute");
+    return {
+      label: locales.getText("pisell2.text.flexible"),
+      value: flexibleObj.create(timeValue)
+    };
+  }
+  return null;
+};
+
+/**
+ * @title: 时间切片
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-01-09 13:37
+ */
+export var getTimeObj = function getTimeObj(_ref3) {
+  var _state$bookingConfig, _state$bookingConfig$, _state$bookingConfig$2;
+  var cacheItem = _ref3.cacheItem,
+    useStartTime = _ref3.useStartTime,
+    currentResource = _ref3.currentResource,
+    state = _ref3.state,
+    useDuration = _ref3.useDuration,
+    durationProps = _ref3.durationProps;
+  var flexibleOption = getFlexibleOption({
+    cacheItem: cacheItem,
+    useStartTime: useStartTime,
+    currentResource: currentResource,
+    state: state,
+    durationProps: durationProps
+  });
+  var obj = sliceDayIntoFiveMinutes((_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 ? void 0 : (_state$bookingConfig$ = _state$bookingConfig.config) === null || _state$bookingConfig$ === void 0 ? void 0 : (_state$bookingConfig$2 = _state$bookingConfig$.basic) === null || _state$bookingConfig$2 === void 0 ? void 0 : _state$bookingConfig$2.service_time, locales.locale);
+  var timeSlices = _toConsumableArray(obj.timeSlices);
+  var durationSlicesBasedOnTime = _toConsumableArray(obj.durationSlicesBasedOnTime);
+
+  // 如果商品是灵活时长, 则增加灵活的选项
+  if (flexibleOption) {
+    durationSlicesBasedOnTime.unshift(flexibleOption);
+  }
+
+  // 如果当前设置的时长没有在列表内, 则在列表的最上面添加此项
+  if (useDuration && !durationSlicesBasedOnTime.some(function (d) {
+    return d.value === useDuration;
+  })) {
+    durationSlicesBasedOnTime.unshift({
+      label: getDiscountTime(useDuration),
+      value: useDuration,
+      //@ts-ignore
+      disabled: true
+    });
+  }
+  // 如果有选择时间, 但是不在列表内 则需要在列表内添加上此值
+  if (useStartTime && useStartTime !== "now" && !timeSlices.some(function (d) {
+    return d.value === useStartTime;
+  })) {
+    timeSlices.unshift({
+      label: dayjs(useStartTime, "HH:mm").format("hh:mm A"),
+      value: useStartTime
+    });
+  }
+
+  // 增加当前
+  timeSlices.unshift({
+    label: locales.getText("pisell2.text.now"),
+    value: "now"
+  });
+  return _objectSpread(_objectSpread({}, obj), {}, {
+    timeSlices: timeSlices,
+    durationSlicesBasedOnTime: durationSlicesBasedOnTime
+  });
+};
+
+/**
+ * @title: 获取资源列表
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-01-09 13:38
+ */
+export var formatResources = function formatResources(_ref4) {
+  var cacheItem = _ref4.cacheItem,
+    resourcesOrigin = _ref4.resourcesOrigin;
+  try {
+    // 合并无资源
+    var _list = _toConsumableArray(resourcesOrigin);
+    var _cacheItem = cacheItem;
+    // 格式化, 添加自定义参数
+    _list = _list.map(function (d) {
+      return formatResource(d, _cacheItem, function (item) {
+        return /*#__PURE__*/React.createElement("div", {
+          className: "resource-option"
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "like-wrap"
+        }), item.labelText, !item.usable && /*#__PURE__*/React.createElement(AlertTriangle, {
+          className: "resource-option-alert-icon"
+        }));
+      });
+    });
+    // 排序, 将可用资源放在最前面
+    _list = _list.sort(function (a, b) {
+      return b.usable ? 1 : -1;
+    });
+    return _list;
+  } catch (err) {
+    console.log("formatResourcesErr", err);
+  }
+  return [];
+};
+export var checkCacheItemResource = function checkCacheItemResource(_ref5) {
+  var cacheItem = _ref5.cacheItem,
+    resources = _ref5.resources;
+  var resourceId = cacheItem._extend.resource;
+  if (resourceId || resourceId === 0) {
+    // 校验, 如果当前选择的资源 在列表里没找到, 则恢复成无资源, 防止数据错乱
+    if (!resources.find(function (d) {
+      return d.form_record_id === resourceId;
+    })) {
+      resourceId = undefined;
+    }
+  } else {
+    if (cacheItem.new) {
+      if (resources.length === 2) {
+        resourceId = resources[1].form_record_id;
+      }
+      if (resources.length > 2) {
+        var usableList = resources.filter(function (d) {
+          return d.usable && d.form_id !== 0;
+        });
+        if (usableList.length === 1) {
+          resourceId = usableList[0].form_record_id;
+        }
+      }
+    }
+  }
+  return resourceId;
+};
+
+/**
+ * @title: 预生成服务的 extend
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-06-01 13:25
+ */
+export var getProductExtend = function getProductExtend(_ref6) {
+  var cacheItem = _ref6.cacheItem,
+    state = _ref6.state;
+  // 获取资源源列表
+  var resourcesOrigin = state.service.resourcesOrigin || [];
+  var currentResource = null;
+
+  // 编辑时,找到当前选择的资源
+  if (!cacheItem.new) {
+    // 格式化资源列表
+    var _resources = formatResources({
+      cacheItem: cacheItem,
+      resourcesOrigin: resourcesOrigin
+    });
+    var item = _resources.find(function (d) {
+      return d.form_record_id == cacheItem._extend.resource;
+    }) || {};
+    if (item) {
+      currentResource = item;
+    }
+  }
+
+  // 时间切片
+  var timeObj = getTimeObj({
+    cacheItem: cacheItem,
+    currentResource: currentResource,
+    state: state
+  });
+
+  // 生成数据
+  var _extend = getServerItemExtend(state, cacheItem, timeObj);
+
+  // 格式化资源列表
+  var resources = formatResources({
+    cacheItem: _objectSpread(_objectSpread({}, cacheItem), {}, {
+      _extend: _extend
+    }),
+    resourcesOrigin: resourcesOrigin
+  });
+
+  // 最终根据资源列表 决定是否设置默认的资源
+  _extend.resource = checkCacheItemResource({
+    cacheItem: _objectSpread(_objectSpread({}, cacheItem), {}, {
+      _extend: _extend
+    }),
+    resources: resources
+  });
+  return _extend;
+};