fix: 修复最大时间约束不了时间范围选择器的结束时间问题 (#9154)

baidu · Dec 18, 2023 · e9a0d24 · e9a0d24
1 parent 2e38351
commit e9a0d24
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/amis-ui/src/components/DateRangePicker.tsx b/packages/amis-ui/src/components/DateRangePicker.tsx
@@ -1129,7 +1129,7 @@ export class DateRangePicker extends React.Component<
 
   // 根据 duration 修复结束时间
   getEndDateByDuration(newValue: moment.Moment) {
-    const {minDuration, maxDuration, type} = this.props;
+    const {minDuration, maxDuration, type, maxDate} = this.props;
     let {startDate, endDate, editState} = this.state;
     if (!startDate) {
       return newValue;
@@ -1152,6 +1152,10 @@ export class DateRangePicker extends React.Component<
       newValue = startDate.clone().add(maxDuration);
     }
 
+    if (maxDate && newValue && newValue.isAfter(maxDate, 'second')) {
+      newValue = maxDate;
+    }
+
     return newValue;
   }