@pisell/private-materials 3.0.195 → 3.0.197

package/es/components/booking/info/service/addService/index.less

@@ -3,8 +3,9 @@
   // border-bottom: 1px solid var(--gray-300, #D0D5DD);
 }
 
-.pisell-lowcode__booking-service-body {
-  background: var(--gray-50, #F9FAFB);
+.pisell-lowcode__booking-service-body,
+.pisell-lowcode__booking-service-date-body {
+  background: var(--gray-50, #f9fafb);
 }
 
 .pisell-lowcode__booking-vertical-add-service-wrap {
@@ -25,6 +26,7 @@
   .booking-category-list {
     padding: 0 16px !important;
   }
+
   .pisell-lowcode__booking-service-body {
     .booking-tab-product {
       .booking-tabs-wrap {
@@ -32,4 +34,12 @@
       }
     }
   }
-}
+
+  .pisell-lowcode__booking-service-date-body {
+    .booking-tab-product {
+      .booking-tabs-wrap {
+        top: 136px !important;
+      }
+    }
+  }
+}

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

@@ -1,4 +1,4 @@
-import dayjs from "dayjs";
+import dayjs from 'dayjs';
 export declare const getDurationProps: ({ cacheItem, useStartTime, currentResource, slice, }: any) => {
     startDate: dayjs.Dayjs;
     usableTime: any;
@@ -48,7 +48,7 @@ export declare const getTimeObj: ({ cacheItem, useStartTime, currentResource, st
  * @Author: zhiwei.Wang
  * @Date: 2024-01-09 13:38
  */
-export declare const formatResources: ({ cacheItem, resourcesOrigin }: any) => any[];
+export declare const formatResources: ({ cacheItem, resourcesOrigin, isDay }: any) => any[];
 export declare const checkCacheItemResource: ({ cacheItem, resources }: any) => any;
 /**
  * @title: 预生成服务的 extend
@@ -59,3 +59,12 @@ export declare const checkCacheItemResource: ({ cacheItem, resources }: any) =>
  * @Date: 2024-06-01 13:25
  */
 export declare const getProductExtend: ({ cacheItem, state }: any) => any;
+/**
+ * @title: 获取资源标题
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-09 15:53
+ */
+export declare const getResourceTitle: ({ state, id }: any) => any;

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

@@ -10,11 +10,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 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";
+import dayjs from 'dayjs';
+import { locales } from '@pisell/utils';
+import AlertTriangle from '@pisell/icon/es/AlertTriangle';
+import { isDayBooking } from "../../service2/utils";
 export var getDurationProps = function getDurationProps(_ref) {
   var _currentResource$_ext;
   var cacheItem = _ref.cacheItem,
@@ -23,13 +24,13 @@ export var getDurationProps = function getDurationProps(_ref) {
     slice = _ref.slice;
   var _cacheItem = cacheItem;
   return {
-    startDate: dayjs(dayjs(_cacheItem._extend.start_date).format("YYYY-MM-DD ") + (getServeStartTime(useStartTime) || "00:00")),
+    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"
+      size: 'large'
     }
   };
 };
@@ -55,14 +56,14 @@ export var getFlexibleOption = function getFlexibleOption(_ref2) {
     slice: slice
   });
   var _duration = _durationProps.duration;
-  if (_duration === "flexible") {
+  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");
+    var timeValue = endDate.diff(_durationProps.startDate, 'minute');
     return {
-      label: locales.getText("pisell2.text.flexible"),
+      label: locales.getText('pisell2.text.flexible'),
       value: flexibleObj.create(timeValue)
     };
   }
@@ -91,7 +92,7 @@ export var getTimeObj = function getTimeObj(_ref3) {
     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 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, isDayBooking(state));
   var timeSlices = _toConsumableArray(obj.timeSlices);
   var durationSlicesBasedOnTime = _toConsumableArray(obj.durationSlicesBasedOnTime);
 
@@ -105,26 +106,26 @@ export var getTimeObj = function getTimeObj(_ref3) {
     return d.value === useDuration;
   })) {
     durationSlicesBasedOnTime.unshift({
-      label: getDiscountTime(useDuration),
+      label: getDiscountTime(useDuration, isDayBooking(state)),
       value: useDuration,
       //@ts-ignore
       disabled: true
     });
   }
   // 如果有选择时间, 但是不在列表内 则需要在列表内添加上此值
-  if (useStartTime && useStartTime !== "now" && !timeSlices.some(function (d) {
+  if (useStartTime && useStartTime !== 'now' && !timeSlices.some(function (d) {
     return d.value === useStartTime;
   })) {
     timeSlices.unshift({
-      label: dayjs(useStartTime, "HH:mm").format("hh:mm A"),
+      label: dayjs(useStartTime, 'HH:mm').format('hh:mm A'),
       value: useStartTime
     });
   }
 
   // 增加当前
   timeSlices.unshift({
-    label: locales.getText("pisell2.text.now"),
-    value: "now"
+    label: locales.getText('pisell2.text.now'),
+    value: 'now'
   });
   return _objectSpread(_objectSpread({}, obj), {}, {
     timeSlices: timeSlices,
@@ -141,7 +142,8 @@ export var getTimeObj = function getTimeObj(_ref3) {
  */
 export var formatResources = function formatResources(_ref4) {
   var cacheItem = _ref4.cacheItem,
-    resourcesOrigin = _ref4.resourcesOrigin;
+    resourcesOrigin = _ref4.resourcesOrigin,
+    isDay = _ref4.isDay;
   try {
     // 合并无资源
     var _list = _toConsumableArray(resourcesOrigin);
@@ -156,7 +158,7 @@ export var formatResources = function formatResources(_ref4) {
         }), item.labelText, !item.usable && /*#__PURE__*/React.createElement(AlertTriangle, {
           className: "resource-option-alert-icon"
         }));
-      });
+      }, isDay);
     });
     // 排序, 将可用资源放在最前面
     _list = _list.sort(function (a, b) {
@@ -164,7 +166,7 @@ export var formatResources = function formatResources(_ref4) {
     });
     return _list;
   } catch (err) {
-    console.log("formatResourcesErr", err);
+    console.log('formatResourcesErr', err);
   }
   return [];
 };
@@ -175,21 +177,23 @@ export var checkCacheItemResource = function checkCacheItemResource(_ref5) {
   if (resourceId || resourceId === 0) {
     // 校验, 如果当前选择的资源 在列表里没找到, 则恢复成无资源, 防止数据错乱
     if (!resources.find(function (d) {
-      return d.form_record_id === resourceId;
+      return (d === null || d === void 0 ? void 0 : d.form_record_id) === resourceId;
     })) {
       resourceId = undefined;
     }
   } else {
     if (cacheItem.new) {
       if (resources.length <= 2) {
-        resourceId = resources[resources.length - 1].form_record_id;
+        var _resources;
+        resourceId = resources === null || resources === void 0 ? void 0 : (_resources = resources[(resources === null || resources === void 0 ? void 0 : resources.length) - 1]) === null || _resources === void 0 ? void 0 : _resources.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;
+          var _usableList$;
+          resourceId = usableList === null || usableList === void 0 ? void 0 : (_usableList$ = usableList[0]) === null || _usableList$ === void 0 ? void 0 : _usableList$.form_record_id;
         }
       }
     }
@@ -219,12 +223,13 @@ export var getProductExtend = function getProductExtend(_ref6) {
   // 编辑时,找到当前选择的资源
   if (!cacheItem.new) {
     // 格式化资源列表
-    var _resources = formatResources({
+    var _resources2 = formatResources({
       cacheItem: cacheItem,
       resourcesOrigin: resourcesOrigin
     });
-    var item = _resources.find(function (d) {
-      return d.form_record_id == cacheItem._extend.resource;
+    var item = _resources2.find(function (d) {
+      var _cacheItem$_extend;
+      return (d === null || d === void 0 ? void 0 : d.form_record_id) == ((_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.resource);
     }) || {};
     if (item) {
       currentResource = item;
@@ -257,4 +262,24 @@ export var getProductExtend = function getProductExtend(_ref6) {
     resources: resources
   });
   return _extend;
+};
+
+/**
+ * @title: 获取资源标题
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-09 15:53
+ */
+export var getResourceTitle = function getResourceTitle(_ref7) {
+  var _state$client;
+  var state = _ref7.state,
+    id = _ref7.id;
+  var resources = (state === null || state === void 0 ? void 0 : (_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || [];
+  if (!resources.length) return '';
+  var resource = resources.find(function (d) {
+    return d.id === id;
+  });
+  return (resource === null || resource === void 0 ? void 0 : resource.main_field) || '-';
 };