@pisell/private-materials 6.6.2 → 6.6.3

package/lib/pro/multiDayTimeSelect/MultiDayTimeSelect.js

@@ -38,6 +38,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_materials = require("@pisell/materials");
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
+var import_dateRange = require("../../components/booking/info/dateRange");
 var import_MultiDayTimeSelect = require("./MultiDayTimeSelect.less");
 var RangePicker = import_materials.DatePicker.RangePicker;
 var MultiDayTimeSelect = (0, import_react.forwardRef)(({
@@ -72,8 +73,16 @@ var MultiDayTimeSelect = (0, import_react.forwardRef)(({
         value: i
       });
     }
+    const currentDuration = internalValue == null ? void 0 : internalValue.duration;
+    if (currentDuration && currentDuration > maxDays) {
+      options.push({
+        label: `${currentDuration} ${currentDuration === 1 ? locale === "en" ? "day" : "天" : locale === "en" ? "days" : "天"}`,
+        value: currentDuration,
+        disabled: true
+      });
+    }
     return options;
-  }, [maxDays, locale]);
+  }, [maxDays, locale, internalValue == null ? void 0 : internalValue.duration]);
   (0, import_react.useEffect)(() => {
     if (value) {
       setInternalValue(value);
@@ -110,17 +119,6 @@ var MultiDayTimeSelect = (0, import_react.forwardRef)(({
       const days = dates[1].diff(dates[0], "day");
       let finalEndDate = dates[1];
       let finalDuration = days;
-      if (days > maxDays) {
-        const endTime = {
-          hour: dates[1].hour(),
-          minute: dates[1].minute(),
-          second: dates[1].second(),
-          millisecond: dates[1].millisecond()
-        };
-        finalEndDate = dates[0].add(maxDays, "day");
-        finalEndDate = finalEndDate.hour(endTime.hour).minute(endTime.minute).second(endTime.second).millisecond(endTime.millisecond);
-        finalDuration = maxDays;
-      }
       if (days > 0) {
         const newValue = {
           startDate: dates[0],
@@ -162,29 +160,16 @@ var MultiDayTimeSelect = (0, import_react.forwardRef)(({
   const handleEndDateChange = (date) => {
     if (date && internalValue) {
       const days = date.diff(internalValue.startDate, "day");
-      let finalEndDate = date;
-      let finalDuration = days;
-      if (days > maxDays) {
-        const endTime = {
-          hour: date.hour(),
-          minute: date.minute(),
-          second: date.second(),
-          millisecond: date.millisecond()
-        };
-        finalEndDate = internalValue.startDate.add(maxDays, "day");
-        finalEndDate = finalEndDate.hour(endTime.hour).minute(endTime.minute).second(endTime.second).millisecond(endTime.millisecond);
-        finalDuration = maxDays;
-      }
       if (days > 0) {
         const newValue = {
           startDate: internalValue.startDate,
-          endDate: finalEndDate,
-          duration: finalDuration
+          endDate: date,
+          duration: days
         };
         updateValue(newValue);
         form.setFieldsValue({
-          endDate: finalEndDate,
-          duration: finalDuration
+          endDate: date,
+          duration: days
         });
       }
     }
@@ -278,7 +263,8 @@ var MultiDayTimeSelect = (0, import_react.forwardRef)(({
         format: formatLocale,
         isHideCustomSelect: true,
         endDateDays: 1,
-        disabled
+        disabled,
+        disabledDate: import_dateRange.disabledDate
       }
     ))
   )), /* @__PURE__ */ import_react.default.createElement(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.2",
+  "version": "6.6.3",
   "scripts": {
     "dev": "father dev",
     "build": "father build",