@pisell/pisellos 3.0.52 → 3.0.53
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/Cart/utils/cartResource.js +1 -1
- package/dist/modules/Resource/types.d.ts +1 -0
- package/dist/modules/Schedule/utils.js +7 -1
- package/lib/modules/Cart/utils/cartResource.js +1 -1
- package/lib/modules/Resource/types.d.ts +1 -0
- package/lib/modules/Schedule/utils.js +8 -3
- package/package.json +1 -1
|
@@ -46,7 +46,7 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
|
|
|
46
46
|
}
|
|
47
47
|
var obj = {
|
|
48
48
|
relation_type: 'form',
|
|
49
|
-
like_status: 'common',
|
|
49
|
+
like_status: resource.like_status || 'common',
|
|
50
50
|
id: resource.id,
|
|
51
51
|
main_field: resource.main_field,
|
|
52
52
|
resourceType: resource.resourceType,
|
|
@@ -140,6 +140,12 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
|
|
|
140
140
|
for (var i = 0; i < frequency_date.length; i++) {
|
|
141
141
|
var item = frequency_date[i];
|
|
142
142
|
var _start = startTmp.day(item);
|
|
143
|
+
|
|
144
|
+
// 如果计算出的日期早于startTmp，则跳到下一周的相同星期几
|
|
145
|
+
if (_start.isBefore(startTmp, 'day')) {
|
|
146
|
+
_start = _start.add(1, 'week');
|
|
147
|
+
}
|
|
148
|
+
|
|
143
149
|
// 如果周结束的那一天还超过了deadline，则需要把_end置为deadline
|
|
144
150
|
var _end = _start.add(scheduleDiff, 'second');
|
|
145
151
|
if (_end.isAfter(deadline, 'day')) {
|
|
@@ -161,7 +167,7 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
|
|
|
161
167
|
daysArr.push.apply(daysArr, _toConsumableArray(getDaysByStartEnd(_start, _end)));
|
|
162
168
|
}
|
|
163
169
|
}
|
|
164
|
-
startTmp = startTmp.
|
|
170
|
+
startTmp = startTmp.add(frequency, 'week');
|
|
165
171
|
}
|
|
166
172
|
return Array.from(new Set(daysArr));
|
|
167
173
|
};
|
|
@@ -74,7 +74,7 @@ var formatResourceToCartItemOrigin = (params) => {
|
|
|
74
74
|
}
|
|
75
75
|
const obj = {
|
|
76
76
|
relation_type: "form",
|
|
77
|
-
like_status: "common",
|
|
77
|
+
like_status: resource.like_status || "common",
|
|
78
78
|
id: resource.id,
|
|
79
79
|
main_field: resource.main_field,
|
|
80
80
|
resourceType: resource.resourceType,
|
|
@@ -139,7 +139,10 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
|
|
|
139
139
|
while (startTmp.isBefore(deadline, "day") || startTmp.isSame(deadline, "day")) {
|
|
140
140
|
for (let i = 0; i < frequency_date.length; i++) {
|
|
141
141
|
const item = frequency_date[i];
|
|
142
|
-
|
|
142
|
+
let _start = startTmp.day(item);
|
|
143
|
+
if (_start.isBefore(startTmp, "day")) {
|
|
144
|
+
_start = _start.add(1, "week");
|
|
145
|
+
}
|
|
143
146
|
let _end = _start.add(scheduleDiff, "second");
|
|
144
147
|
if (_end.isAfter(deadline, "day")) {
|
|
145
148
|
_end = deadline;
|
|
@@ -160,7 +163,7 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
|
|
|
160
163
|
daysArr.push(...getDaysByStartEnd(_start, _end));
|
|
161
164
|
}
|
|
162
165
|
}
|
|
163
|
-
startTmp = startTmp.
|
|
166
|
+
startTmp = startTmp.add(frequency, "week");
|
|
164
167
|
}
|
|
165
168
|
return Array.from(new Set(daysArr));
|
|
166
169
|
};
|
|
@@ -585,7 +588,9 @@ function getAllSortedDateRanges(schedules) {
|
|
|
585
588
|
return durationA - durationB;
|
|
586
589
|
});
|
|
587
590
|
const uniqueDateRanges = sortedDateRanges.filter(
|
|
588
|
-
(range, index, self) => index === self.findIndex(
|
|
591
|
+
(range, index, self) => index === self.findIndex(
|
|
592
|
+
(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))
|
|
593
|
+
)
|
|
589
594
|
);
|
|
590
595
|
return uniqueDateRanges;
|
|
591
596
|
}
|