@pisell/private-materials 3.4.9 → 3.4.10
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/build/lowcode/assets-daily.json +11 -11
- package/build/lowcode/assets-dev.json +2 -2
- package/build/lowcode/assets-prod.json +11 -11
- package/build/lowcode/meta.js +1 -1
- package/build/lowcode/render/default/view.js +3 -3
- package/build/lowcode/view.js +3 -3
- package/es/components/booking/forms/single/RenderValueById.js +2 -2
- package/es/components/booking/info/hooks/useInfoHolder.d.ts +1 -0
- package/es/components/booking/info/service/Lists.d.ts +1 -0
- package/es/components/booking/info/service/addService/utils.d.ts +1 -1
- package/es/components/booking/info/service/editService/BookingList/index.d.ts +1 -0
- package/es/components/booking/info/service2/Lists.d.ts +1 -0
- package/es/components/booking/info/utils.js +1 -1
- package/es/components/booking/info2/service/addService/utils.d.ts +1 -1
- package/es/components/booking/info2/service/addService/utils.js +2 -1
- package/es/components/booking/info2/utilsByBooking.js +3 -2
- package/es/components/booking/materiels/duration/index.js +1 -1
- package/es/components/booking/materiels/holder/index.d.ts +1 -0
- package/es/components/booking/materiels/startTime/index.d.ts +1 -0
- package/es/components/booking/materiels/startTime/index.js +2 -2
- package/es/components/booking/utils.js +3 -3
- package/es/components/schedules/components/CurrentDay/index.d.ts +1 -0
- package/es/components/schedules/products/index.d.ts +1 -0
- package/es/components/ticketBooking/components/addServiceVariant/addService.js +1 -1
- package/lib/components/booking/forms/single/RenderValueById.js +6 -6
- package/lib/components/booking/info/hooks/useInfoHolder.d.ts +1 -0
- package/lib/components/booking/info/service/Lists.d.ts +1 -0
- package/lib/components/booking/info/service/addService/utils.d.ts +1 -1
- package/lib/components/booking/info/service/editService/BookingList/index.d.ts +1 -0
- package/lib/components/booking/info/service2/Lists.d.ts +1 -0
- package/lib/components/booking/info/utils.js +2 -1
- package/lib/components/booking/info2/service/addService/utils.d.ts +1 -1
- package/lib/components/booking/info2/service/addService/utils.js +3 -3
- package/lib/components/booking/info2/utilsByBooking.js +4 -4
- package/lib/components/booking/materiels/duration/index.js +1 -1
- package/lib/components/booking/materiels/holder/index.d.ts +1 -0
- package/lib/components/booking/materiels/startTime/index.d.ts +1 -0
- package/lib/components/booking/materiels/startTime/index.js +1 -1
- package/lib/components/booking/utils.js +3 -3
- package/lib/components/schedules/components/CurrentDay/index.d.ts +1 -0
- package/lib/components/schedules/products/index.d.ts +1 -0
- package/lib/components/ticketBooking/components/addServiceVariant/addService.js +1 -1
- package/package.json +4 -4
|
@@ -5,14 +5,14 @@ import { useRequest } from "ahooks";
|
|
|
5
5
|
import useEngineContext from "../../../../hooks/useEngineContext";
|
|
6
6
|
import { getFormData } from "../serve";
|
|
7
7
|
var RenderValueById = function RenderValueById(props) {
|
|
8
|
-
var _field$setting, _field$setting6;
|
|
8
|
+
var _field$setting, _ref, _ref$toString, _field$setting6;
|
|
9
9
|
var field = props.field,
|
|
10
10
|
propsValue = props.value;
|
|
11
11
|
var _useEngineContext = useEngineContext(),
|
|
12
12
|
appHelper = _useEngineContext.appHelper;
|
|
13
13
|
var _getFormData = useRequest(getFormData, {
|
|
14
14
|
manual: true,
|
|
15
|
-
cacheKey: "formOption-".concat((_field$setting = field.setting) === null || _field$setting === void 0 ? void 0 : _field$setting.linkedTable),
|
|
15
|
+
cacheKey: "formOption-".concat((_field$setting = field.setting) === null || _field$setting === void 0 ? void 0 : _field$setting.linkedTable, "-").concat((_ref = propsValue || []) === null || _ref === void 0 || (_ref$toString = _ref.toString) === null || _ref$toString === void 0 ? void 0 : _ref$toString.call(_ref)),
|
|
16
16
|
staleTime: 500,
|
|
17
17
|
cacheTime: 5000
|
|
18
18
|
});
|
|
@@ -95,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType, business
|
|
|
95
95
|
if (renderType === 'eventBooking') {
|
|
96
96
|
return false;
|
|
97
97
|
}
|
|
98
|
-
var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913, 8918, 6413];
|
|
98
|
+
var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913, 8918, 6413, 8943];
|
|
99
99
|
|
|
100
100
|
// 固定的shopId 或者安装 Resource Kit 应用,则认为是booking4Shop
|
|
101
101
|
return booking4Shops.includes(shopId) || (businessUtils === null || businessUtils === void 0 ? void 0 : businessUtils.getAppByModal('resourcekit'));
|
|
@@ -584,7 +584,8 @@ export var getProductExtend = function getProductExtend(_ref11) {
|
|
|
584
584
|
state: state
|
|
585
585
|
});
|
|
586
586
|
if (getDuration(_cacheItem === null || _cacheItem === void 0 ? void 0 : _cacheItem.duration) === 'flexible') {
|
|
587
|
-
|
|
587
|
+
var _cacheItem$_data$time;
|
|
588
|
+
_cacheItem._extend.duration = (_cacheItem$_data$time = _cacheItem._data.timeObj) === null || _cacheItem$_data$time === void 0 || (_cacheItem$_data$time = _cacheItem$_data$time.durationSlicesBasedOnTime) === null || _cacheItem$_data$time === void 0 || (_cacheItem$_data$time = _cacheItem$_data$time[0]) === null || _cacheItem$_data$time === void 0 ? void 0 : _cacheItem$_data$time.value;
|
|
588
589
|
|
|
589
590
|
// 计算服务的开始和结束时间
|
|
590
591
|
var _getServiceTimes = getServiceTimes({
|
|
@@ -328,7 +328,7 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
|
|
|
328
328
|
// 下一个商品的扩展参数
|
|
329
329
|
var _extend = {
|
|
330
330
|
// 时长: 当前商品时长 > 第一个时长
|
|
331
|
-
duration: findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
|
|
331
|
+
duration: findNextDuration(cacheItem.duration, timeObj === null || timeObj === void 0 ? void 0 : timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value)
|
|
332
332
|
};
|
|
333
333
|
|
|
334
334
|
// 如果有上一个商品, 将上一个商品的某些参数 设置到新商品上
|
|
@@ -342,7 +342,8 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
|
|
|
342
342
|
} else {
|
|
343
343
|
// 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段, 不跨天则取上一个的结束时间
|
|
344
344
|
if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
|
|
345
|
-
|
|
345
|
+
var _timeObj$timeSlices;
|
|
346
|
+
_extend.start_time = timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices[(timeObj === null || timeObj === void 0 || (_timeObj$timeSlices = timeObj.timeSlices) === null || _timeObj$timeSlices === void 0 ? void 0 : _timeObj$timeSlices.length) - 1].value;
|
|
346
347
|
} else {
|
|
347
348
|
_extend.start_time = lastServerEndDate.format("HH:mm");
|
|
348
349
|
}
|
|
@@ -60,7 +60,7 @@ var Duration = function Duration(props) {
|
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
return durationSlicesBasedOnTime;
|
|
63
|
-
}, [timeObj.durationSlicesBasedOnTime, slice, locale, duration, startDateStr, usableTime === null || usableTime === void 0 ? void 0 : usableTime.end_at]);
|
|
63
|
+
}, [timeObj === null || timeObj === void 0 ? void 0 : timeObj.durationSlicesBasedOnTime, slice, locale, duration, startDateStr, usableTime === null || usableTime === void 0 ? void 0 : usableTime.end_at]);
|
|
64
64
|
useEffect(function () {
|
|
65
65
|
timeObjChange === null || timeObjChange === void 0 || timeObjChange(times);
|
|
66
66
|
}, [times]);
|
|
@@ -25,7 +25,7 @@ var StartTime = function StartTime(props) {
|
|
|
25
25
|
return sliceDayIntoFiveMinutes(slice, locale);
|
|
26
26
|
}, [slice, locale]);
|
|
27
27
|
useEffect(function () {
|
|
28
|
-
timeObjChange === null || timeObjChange === void 0
|
|
28
|
+
timeObjChange === null || timeObjChange === void 0 || timeObjChange(timeObj);
|
|
29
29
|
}, [timeObj]);
|
|
30
30
|
var renderOptions = useCallback(function (array) {
|
|
31
31
|
var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "value";
|
|
@@ -37,6 +37,6 @@ var StartTime = function StartTime(props) {
|
|
|
37
37
|
}, d[label]);
|
|
38
38
|
});
|
|
39
39
|
}, []);
|
|
40
|
-
return /*#__PURE__*/React.createElement(Select, _extends({}, selectProps, resetProps), renderOptions(timeObj.timeSlices));
|
|
40
|
+
return /*#__PURE__*/React.createElement(Select, _extends({}, selectProps, resetProps), renderOptions(timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices));
|
|
41
41
|
};
|
|
42
42
|
export default StartTime;
|
|
@@ -670,7 +670,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
|
|
|
670
670
|
if (isSession) {
|
|
671
671
|
return getDays(cacheItem, 'minutes');
|
|
672
672
|
}
|
|
673
|
-
return findNextDuration(cacheItem.duration, timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value);
|
|
673
|
+
return findNextDuration(cacheItem.duration, timeObj === null || timeObj === void 0 ? void 0 : timeObj.durationSlicesBasedOnTime, cacheItem === null || cacheItem === void 0 || (_cacheItem$duration = cacheItem.duration) === null || _cacheItem$duration === void 0 ? void 0 : _cacheItem$duration.value);
|
|
674
674
|
};
|
|
675
675
|
|
|
676
676
|
// 获取上一个服务商品
|
|
@@ -694,7 +694,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
|
|
|
694
694
|
} else {
|
|
695
695
|
// 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段, 不跨天则取上一个的结束时间
|
|
696
696
|
if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
|
|
697
|
-
_extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
|
|
697
|
+
_extend.start_time = timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices[(timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices.length) - 1].value;
|
|
698
698
|
} else {
|
|
699
699
|
_extend.start_time = lastServerEndDate.format("HH:mm");
|
|
700
700
|
}
|
|
@@ -704,7 +704,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
|
|
|
704
704
|
// _extend.resource = 0;
|
|
705
705
|
|
|
706
706
|
var findNextSliceProps = {
|
|
707
|
-
timeSlices: timeObj.timeSlices,
|
|
707
|
+
timeSlices: timeObj === null || timeObj === void 0 ? void 0 : timeObj.timeSlices,
|
|
708
708
|
index: 0,
|
|
709
709
|
date: ''
|
|
710
710
|
};
|
|
@@ -314,7 +314,7 @@ var AddSerivce = function AddSerivce(props) {
|
|
|
314
314
|
setCurrentProduct(item);
|
|
315
315
|
} else {
|
|
316
316
|
setCurrentProduct(null);
|
|
317
|
-
if (
|
|
317
|
+
if ((item === null || item === void 0 ? void 0 : item.extension_type) === 'normal') {
|
|
318
318
|
cacheValues = {
|
|
319
319
|
bundle: [],
|
|
320
320
|
key: item.id,
|
|
@@ -39,12 +39,12 @@ var import_ahooks = require("ahooks");
|
|
|
39
39
|
var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
|
|
40
40
|
var import_serve = require("../serve");
|
|
41
41
|
var RenderValueById = (props) => {
|
|
42
|
-
var _a, _b, _c, _d, _e, _f;
|
|
42
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
43
43
|
const { field, value: propsValue } = props;
|
|
44
44
|
const { appHelper } = (0, import_useEngineContext.default)();
|
|
45
45
|
const _getFormData = (0, import_ahooks.useRequest)(import_serve.getFormData, {
|
|
46
46
|
manual: true,
|
|
47
|
-
cacheKey: `formOption-${(_a = field.setting) == null ? void 0 : _a.linkedTable}`,
|
|
47
|
+
cacheKey: `formOption-${(_a = field.setting) == null ? void 0 : _a.linkedTable}-${(_c = (_b = propsValue || []) == null ? void 0 : _b.toString) == null ? void 0 : _c.call(_b)}`,
|
|
48
48
|
staleTime: 500,
|
|
49
49
|
cacheTime: 5e3
|
|
50
50
|
});
|
|
@@ -81,7 +81,7 @@ var RenderValueById = (props) => {
|
|
|
81
81
|
}))) || [];
|
|
82
82
|
}
|
|
83
83
|
return (_e2 = field == null ? void 0 : field.setting) == null ? void 0 : _e2.customTypeList;
|
|
84
|
-
}, [field.filed_type, (
|
|
84
|
+
}, [field.filed_type, (_d = field == null ? void 0 : field.setting) == null ? void 0 : _d.customTypeList, _getFormData.data]);
|
|
85
85
|
if ((0, import_utils.isArr)(value)) {
|
|
86
86
|
let _list = options == null ? void 0 : options.filter((i) => {
|
|
87
87
|
return value == null ? void 0 : value.includes((i == null ? void 0 : i.id) || i.value);
|
|
@@ -93,12 +93,12 @@ var RenderValueById = (props) => {
|
|
|
93
93
|
return /* @__PURE__ */ import_react.default.createElement("span", null, _str || "-");
|
|
94
94
|
}
|
|
95
95
|
if (!(0, import_utils.isUndefined)(value)) {
|
|
96
|
-
if ((field == null ? void 0 : field.filed_type) === "select" && !((
|
|
96
|
+
if ((field == null ? void 0 : field.filed_type) === "select" && !((_e = field == null ? void 0 : field.setting) == null ? void 0 : _e.version)) {
|
|
97
97
|
return /* @__PURE__ */ import_react.default.createElement("span", null, value || "-");
|
|
98
98
|
}
|
|
99
99
|
let _item = options == null ? void 0 : options.filter((i) => (i == null ? void 0 : i.id) == value);
|
|
100
|
-
return ((
|
|
101
|
-
((
|
|
100
|
+
return ((_h = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _h.translationShop(
|
|
101
|
+
((_f = _item == null ? void 0 : _item[0]) == null ? void 0 : _f.title) || ((_g = _item == null ? void 0 : _item[0]) == null ? void 0 : _g.label)
|
|
102
102
|
)) || "-";
|
|
103
103
|
}
|
|
104
104
|
return null;
|
|
@@ -145,7 +145,8 @@ var isBooking4Shop = (shopId, renderType, businessUtils) => {
|
|
|
145
145
|
8824,
|
|
146
146
|
8913,
|
|
147
147
|
8918,
|
|
148
|
-
6413
|
|
148
|
+
6413,
|
|
149
|
+
8943
|
|
149
150
|
];
|
|
150
151
|
return booking4Shops.includes(shopId) || (businessUtils == null ? void 0 : businessUtils.getAppByModal("resourcekit"));
|
|
151
152
|
};
|
|
@@ -384,7 +384,7 @@ var getIsAutoClose = (cacheItem) => {
|
|
|
384
384
|
);
|
|
385
385
|
};
|
|
386
386
|
var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
|
|
387
|
-
var _a, _b, _c, _d;
|
|
387
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
388
388
|
const isNew = cacheItem.new || !cacheItem._extend.endDate;
|
|
389
389
|
let _cacheItem = { ...cacheItem };
|
|
390
390
|
const resourcesOriginMap = state.service.resourcesOriginMap || {};
|
|
@@ -432,7 +432,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
|
|
|
432
432
|
state
|
|
433
433
|
});
|
|
434
434
|
if ((0, import_utils.getDuration)(_cacheItem == null ? void 0 : _cacheItem.duration) === "flexible") {
|
|
435
|
-
_cacheItem._extend.duration = _cacheItem._data.timeObj.durationSlicesBasedOnTime[0].value;
|
|
435
|
+
_cacheItem._extend.duration = (_e = (_d = (_c = _cacheItem._data.timeObj) == null ? void 0 : _c.durationSlicesBasedOnTime) == null ? void 0 : _d[0]) == null ? void 0 : _e.value;
|
|
436
436
|
const { startDate, endDate } = (0, import_utils.getServiceTimes)({
|
|
437
437
|
_extend: _cacheItem._extend
|
|
438
438
|
});
|
|
@@ -466,7 +466,7 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
|
|
|
466
466
|
{
|
|
467
467
|
extraResources,
|
|
468
468
|
// 此数据用来控制 该商品所展示的资源是自身关联的, 还是全部的
|
|
469
|
-
resourceTab: (
|
|
469
|
+
resourceTab: (_g = (_f = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f.config) == null ? void 0 : _g.resource_tab,
|
|
470
470
|
resourcesOrigin: state.service.resourcesOrigin
|
|
471
471
|
}
|
|
472
472
|
);
|
|
@@ -208,14 +208,14 @@ var getAppointmentTimingPreference = (state) => {
|
|
|
208
208
|
return ((_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.information_tab) == null ? void 0 : _c.appointment_timing_preference) || "sequential";
|
|
209
209
|
};
|
|
210
210
|
var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
|
|
211
|
-
var _a, _b, _c;
|
|
211
|
+
var _a, _b, _c, _d;
|
|
212
212
|
const appointmentTimingPreference = getAppointmentTimingPreference(state);
|
|
213
213
|
let lastServer = (0, import_utils2.getLastServer)(state.service.value);
|
|
214
214
|
let _extend = {
|
|
215
215
|
// 时长: 当前商品时长 > 第一个时长
|
|
216
216
|
duration: (0, import_utils2.findNextDuration)(
|
|
217
217
|
cacheItem.duration,
|
|
218
|
-
timeObj.durationSlicesBasedOnTime,
|
|
218
|
+
timeObj == null ? void 0 : timeObj.durationSlicesBasedOnTime,
|
|
219
219
|
(_a = cacheItem == null ? void 0 : cacheItem.duration) == null ? void 0 : _a.value
|
|
220
220
|
)
|
|
221
221
|
};
|
|
@@ -226,7 +226,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
|
|
|
226
226
|
_extend.start_time = lastServerStartDate.format("HH:mm");
|
|
227
227
|
} else {
|
|
228
228
|
if ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
|
|
229
|
-
_extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
|
|
229
|
+
_extend.start_time = timeObj == null ? void 0 : timeObj.timeSlices[((_b = timeObj == null ? void 0 : timeObj.timeSlices) == null ? void 0 : _b.length) - 1].value;
|
|
230
230
|
} else {
|
|
231
231
|
_extend.start_time = lastServerEndDate.format("HH:mm");
|
|
232
232
|
}
|
|
@@ -259,7 +259,7 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
|
|
|
259
259
|
const { startDate, endDate } = (0, import_utils2.getServiceTimes)({ _extend });
|
|
260
260
|
_extend.startDate = startDate;
|
|
261
261
|
_extend.endDate = endDate;
|
|
262
|
-
const session = (
|
|
262
|
+
const session = (_d = (_c = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.session;
|
|
263
263
|
if ((0, import_utils2.isSessionProduct)(cacheItem) && session) {
|
|
264
264
|
_extend.start_date = session.start_at;
|
|
265
265
|
_extend.startDate = session.start_at;
|
|
@@ -77,7 +77,7 @@ var Duration = (props) => {
|
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
79
|
return durationSlicesBasedOnTime;
|
|
80
|
-
}, [timeObj.durationSlicesBasedOnTime, slice, locale, duration, startDateStr, usableTime == null ? void 0 : usableTime.end_at]);
|
|
80
|
+
}, [timeObj == null ? void 0 : timeObj.durationSlicesBasedOnTime, slice, locale, duration, startDateStr, usableTime == null ? void 0 : usableTime.end_at]);
|
|
81
81
|
(0, import_react.useEffect)(() => {
|
|
82
82
|
timeObjChange == null ? void 0 : timeObjChange(times);
|
|
83
83
|
}, [times]);
|
|
@@ -52,6 +52,6 @@ var StartTime = (props) => {
|
|
|
52
52
|
},
|
|
53
53
|
[]
|
|
54
54
|
);
|
|
55
|
-
return /* @__PURE__ */ import_react.default.createElement(import_antd.Select, { ...selectProps, ...resetProps }, renderOptions(timeObj.timeSlices));
|
|
55
|
+
return /* @__PURE__ */ import_react.default.createElement(import_antd.Select, { ...selectProps, ...resetProps }, renderOptions(timeObj == null ? void 0 : timeObj.timeSlices));
|
|
56
56
|
};
|
|
57
57
|
var startTime_default = StartTime;
|
|
@@ -550,7 +550,7 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
|
|
|
550
550
|
}
|
|
551
551
|
return findNextDuration(
|
|
552
552
|
cacheItem.duration,
|
|
553
|
-
timeObj.durationSlicesBasedOnTime,
|
|
553
|
+
timeObj == null ? void 0 : timeObj.durationSlicesBasedOnTime,
|
|
554
554
|
(_a = cacheItem == null ? void 0 : cacheItem.duration) == null ? void 0 : _a.value
|
|
555
555
|
);
|
|
556
556
|
};
|
|
@@ -566,14 +566,14 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
|
|
|
566
566
|
_extend.start_time = lastServerStartDate.format("HH:mm");
|
|
567
567
|
} else {
|
|
568
568
|
if ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
|
|
569
|
-
_extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
|
|
569
|
+
_extend.start_time = timeObj == null ? void 0 : timeObj.timeSlices[(timeObj == null ? void 0 : timeObj.timeSlices.length) - 1].value;
|
|
570
570
|
} else {
|
|
571
571
|
_extend.start_time = lastServerEndDate.format("HH:mm");
|
|
572
572
|
}
|
|
573
573
|
}
|
|
574
574
|
} else {
|
|
575
575
|
let findNextSliceProps = {
|
|
576
|
-
timeSlices: timeObj.timeSlices,
|
|
576
|
+
timeSlices: timeObj == null ? void 0 : timeObj.timeSlices,
|
|
577
577
|
index: 0,
|
|
578
578
|
date: ""
|
|
579
579
|
};
|
|
@@ -244,7 +244,7 @@ var AddSerivce = (props) => {
|
|
|
244
244
|
setCurrentProduct(item);
|
|
245
245
|
} else {
|
|
246
246
|
setCurrentProduct(null);
|
|
247
|
-
if (
|
|
247
|
+
if ((item == null ? void 0 : item.extension_type) === "normal") {
|
|
248
248
|
cacheValues = {
|
|
249
249
|
bundle: [],
|
|
250
250
|
key: item.id,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pisell/private-materials",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.10",
|
|
4
4
|
"main": "./lib/index.js",
|
|
5
5
|
"module": "./es/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|
|
@@ -59,10 +59,10 @@
|
|
|
59
59
|
"react-infinite-scroll-component": "^6.1.0",
|
|
60
60
|
"rc-virtual-list": "^3.11.3",
|
|
61
61
|
"decimal.js": "^10.4.3",
|
|
62
|
-
"@pisell/
|
|
63
|
-
"@pisell/materials": "3.3.50",
|
|
62
|
+
"@pisell/icon": "0.0.11",
|
|
64
63
|
"@pisell/date-picker": "3.0.2",
|
|
65
|
-
"@pisell/
|
|
64
|
+
"@pisell/utils": "3.0.0",
|
|
65
|
+
"@pisell/materials": "3.3.50"
|
|
66
66
|
},
|
|
67
67
|
"peerDependencies": {
|
|
68
68
|
"react": "^18.0.0",
|