@pisell/pisellos 1.0.47 → 1.0.49

package/dist/modules/Cart/utils/cartResource.js

@@ -46,7 +46,7 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
         }
         var obj = {
           relation_type: 'form',
-          like_status: 'common',
+          like_status: resource.like_status || 'common',
           id: resource.id,
           main_field: resource.main_field,
           resourceType: resource.resourceType,

package/dist/modules/Resource/types.d.ts

@@ -16,6 +16,7 @@ export interface ResourceTimeSlot {
  * 资源信息
  */
 export interface Resource {
+    like_status: 'common' | 'like';
     id: string | number;
     main_field: string;
     form_id: string | number;

package/dist/modules/Schedule/utils.js

@@ -140,6 +140,12 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
     for (var i = 0; i < frequency_date.length; i++) {
       var item = frequency_date[i];
       var _start = startTmp.day(item);
+
+      // 如果计算出的日期早于startTmp，则跳到下一周的相同星期几
+      if (_start.isBefore(startTmp, 'day')) {
+        _start = _start.add(1, 'week');
+      }
+
       // 如果周结束的那一天还超过了deadline，则需要把_end置为deadline
       var _end = _start.add(scheduleDiff, 'second');
       if (_end.isAfter(deadline, 'day')) {
@@ -161,7 +167,7 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
         daysArr.push.apply(daysArr, _toConsumableArray(getDaysByStartEnd(_start, _end)));
       }
     }
-    startTmp = startTmp.day(1).add(frequency, 'week');
+    startTmp = startTmp.add(frequency, 'week');
   }
   return Array.from(new Set(daysArr));
 };

package/dist/solution/BookingByStep/utils/resources.js

@@ -423,6 +423,10 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
 
   // 存储所有时间切片
   var timeSlices = [];
+  // times 先以开始时间为准做个排序，时间早的先循环
+  times.sort(function (a, b) {
+    return dayjs(a.start_at).diff(dayjs(b.start_at), 'minute');
+  });
 
   // 处理每个时间范围
   times.forEach(function (time) {

package/lib/modules/Cart/utils/cartResource.js

@@ -74,7 +74,7 @@ var formatResourceToCartItemOrigin = (params) => {
         }
         const obj = {
           relation_type: "form",
-          like_status: "common",
+          like_status: resource.like_status || "common",
           id: resource.id,
           main_field: resource.main_field,
           resourceType: resource.resourceType,

package/lib/modules/Resource/types.d.ts

@@ -16,6 +16,7 @@ export interface ResourceTimeSlot {
  * 资源信息
  */
 export interface Resource {
+    like_status: 'common' | 'like';
     id: string | number;
     main_field: string;
     form_id: string | number;

package/lib/modules/Schedule/utils.js

@@ -139,7 +139,10 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
   while (startTmp.isBefore(deadline, "day") || startTmp.isSame(deadline, "day")) {
     for (let i = 0; i < frequency_date.length; i++) {
       const item = frequency_date[i];
-      const _start = startTmp.day(item);
+      let _start = startTmp.day(item);
+      if (_start.isBefore(startTmp, "day")) {
+        _start = _start.add(1, "week");
+      }
       let _end = _start.add(scheduleDiff, "second");
       if (_end.isAfter(deadline, "day")) {
         _end = deadline;
@@ -160,7 +163,7 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
         daysArr.push(...getDaysByStartEnd(_start, _end));
       }
     }
-    startTmp = startTmp.day(1).add(frequency, "week");
+    startTmp = startTmp.add(frequency, "week");
   }
   return Array.from(new Set(daysArr));
 };
@@ -585,7 +588,9 @@ function getAllSortedDateRanges(schedules) {
     return durationA - durationB;
   });
   const uniqueDateRanges = sortedDateRanges.filter(
-    (range, index, self) => index === self.findIndex((t) => (0, import_dayjs.default)(t.start).isSame((0, import_dayjs.default)(range.start)) && (0, import_dayjs.default)(t.end).isSame((0, import_dayjs.default)(range.end)))
+    (range, index, self) => index === self.findIndex(
+      (t) => (0, import_dayjs.default)(t.start).isSame((0, import_dayjs.default)(range.start)) && (0, import_dayjs.default)(t.end).isSame((0, import_dayjs.default)(range.end))
+    )
   );
   return uniqueDateRanges;
 }

package/lib/solution/BookingByStep/utils/resources.js

@@ -337,8 +337,11 @@ var getTimeSlicesByResource = ({
   operating_day_boundary,
   maxBlockThreshold
 }) => {
-  const { times } = resource;
+  let { times } = resource;
   const timeSlices = [];
+  times.sort((a, b) => {
+    return (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at), "minute");
+  });
   times.forEach((time) => {
     const startTime = (0, import_dayjs.default)(`${time.start_at}`);
     const endTime = (0, import_dayjs.default)(`${time.end_at}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "1.0.47",
+  "version": "1.0.49",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",