amis-ui 3.6.2 → 6.0.0

package/lib/components/DateRangePicker.d.ts

@@ -9,7 +9,7 @@ import moment, { unitOfTime } from 'moment';
 import { ShortCuts } from './DatePicker';
 import type { Moment } from 'moment';
 import type { PlainObject, ThemeProps, LocaleProps } from 'amis-core';
-import type { ViewMode, ChangeEventViewMode } from './calendar/Calendar';
+import type { ViewMode, ChangeEventViewMode, ChangeEventViewStatus } from './calendar/Calendar';
 export interface DateRangePickerProps extends ThemeProps, LocaleProps {
     className?: string;
     popoverClassName?: string;
@@ -147,7 +147,7 @@ export declare class DateRangePicker extends React.Component<DateRangePickerProp
         /** 自动初始化绑定值，用于首次选择且当前未绑定值，默认使用当前时间 */
         autoInitDefaultValue?: boolean;
     }): moment.Moment;
-    handleDateChange(newValue: moment.Moment): void;
+    handleDateChange(newValue: moment.Moment, viewMode?: ChangeEventViewMode, status?: ChangeEventViewStatus): void;
     /**
      * @param {Moment} newValue 当前选择的日期时间值
      * @param {ViewMode=} subControlViewMode 子选择控件的类型，可选参数（'time'），用于区分datetime选择器的触发控件
@@ -232,7 +232,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void; /** 开始时间 */
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<Omit<Pick<Omit<DateRangePickerProps, keyof LocaleProps>, "classnames" | "classPrefix" | "type" | "data" | "embed" | "label" | "style" | "className" | "theme" | "mobileUI" | "value" | "onFocus" | "onBlur" | "onChange" | "disabled" | "dateFormat" | "minDate" | "maxDate" | "timeFormat" | "viewMode" | "utc" | "minDuration" | "maxDuration" | "popoverClassName" | "displayFormat" | "valueFormat" | "minDateRaw" | "maxDateRaw" | "popOverContainer" | "borderMode" | "onRef" | "animation" | "transform"> & {
             inputFormat?: string | undefined;
@@ -252,7 +252,7 @@ declare const _default: {
         } & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>; /** 当前编辑的时间类型：开始时间 ｜ 结束时间 */
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -419,9 +419,7 @@ declare const _default: {
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }): {
             ref: any;
-            childRef(ref: any): void; /**
-             * @deprecated 3.1.0后废弃，用shortcuts替代
-             */
+            childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): React.JSX.Element;
             context: unknown;
@@ -462,9 +460,9 @@ declare const _default: {
                 endDateOpenedFirst?: boolean | undefined;
             } & {
                 locale?: string | undefined;
-                translate?: ((str: string, ...args: any[]) => string) | undefined;
+                translate?: ((str: string, ...args: any[]) => string) | undefined; /** 是否开启游标动画 */
             }>;
-            state: Readonly<{}>;
+            state: Readonly<{}>; /** 日期处理函数，通常用于自定义处理绑定日期的值 */
             refs: {
                 [key: string]: React.ReactInstance;
             };
@@ -634,9 +632,7 @@ declare const _default: {
         translate?: ((str: string, ...args: any[]) => string) | undefined;
     }): {
         ref: any;
-        childRef(ref: any): void; /**
-         * @deprecated 3.1.0后废弃，用shortcuts替代
-         */
+        childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
@@ -677,9 +673,9 @@ declare const _default: {
             endDateOpenedFirst?: boolean | undefined;
         } & {
             locale?: string | undefined;
-            translate?: ((str: string, ...args: any[]) => string) | undefined;
+            translate?: ((str: string, ...args: any[]) => string) | undefined; /** 是否开启游标动画 */
         }>;
-        state: Readonly<{}>;
+        state: Readonly<{}>; /** 日期处理函数，通常用于自定义处理绑定日期的值 */
         refs: {
             [key: string]: React.ReactInstance;
         };
@@ -849,9 +845,7 @@ declare const _default: {
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }): {
             ref: any;
-            childRef(ref: any): void; /**
-             * @deprecated 3.1.0后废弃，用shortcuts替代
-             */
+            childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): React.JSX.Element;
             context: unknown;
@@ -892,9 +886,9 @@ declare const _default: {
                 endDateOpenedFirst?: boolean | undefined;
             } & {
                 locale?: string | undefined;
-                translate?: ((str: string, ...args: any[]) => string) | undefined;
+                translate?: ((str: string, ...args: any[]) => string) | undefined; /** 是否开启游标动画 */
             }>;
-            state: Readonly<{}>;
+            state: Readonly<{}>; /** 日期处理函数，通常用于自定义处理绑定日期的值 */
             refs: {
                 [key: string]: React.ReactInstance;
             };

package/lib/components/DateRangePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -725,8 +725,11 @@ var DateRangePicker = /** @class */ (function (_super) {
         }
         return value;
     };
-    DateRangePicker.prototype.handleDateChange = function (newValue) {
-        var editState = this.state.editState;
+    DateRangePicker.prototype.handleDateChange = function (newValue, viewMode, status) {
+        var embed = this.props.embed;
+        var editState = embed
+            ? this.state.editState || status
+            : this.state.editState;
         if (editState === 'start') {
             this.handleStartDateChange(newValue);
         }
@@ -740,7 +743,7 @@ var DateRangePicker = /** @class */ (function (_super) {
      */
     DateRangePicker.prototype.handleStartDateChange = function (newValue, subControlViewMode) {
         var _a = this.props, minDate = _a.minDate, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, type = _a.type; _a.value;
-        var _b = this.state, startDate = _b.startDate, oldStartDate = _b.oldStartDate, endDateOpenedFirst = _b.endDateOpenedFirst, timeFormat = _b.curTimeFormat;
+        var _b = this.state, startDate = _b.startDate; _b.oldStartDate; var endDateOpenedFirst = _b.endDateOpenedFirst, timeFormat = _b.curTimeFormat;
         if (minDate && newValue.isBefore(minDate)) {
             newValue = minDate;
         }
@@ -749,7 +752,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             originValue: startDate || minDate,
             timeFormat: timeFormat,
             subControlViewMode: subControlViewMode,
-            autoInitDefaultValue: !!timeFormat && newValue && (!oldStartDate || !startDate)
+            autoInitDefaultValue: !!timeFormat && newValue && !startDate
         });
         var newState = {
             startDate: date,
@@ -772,7 +775,7 @@ var DateRangePicker = /** @class */ (function (_super) {
     DateRangePicker.prototype.handelEndDateChange = function (newValue, subControlViewMode) {
         var _this = this;
         var _a = this.props, embed = _a.embed, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, type = _a.type; _a.value;
-        var _b = this.state; _b.startDate; var endDate = _b.endDate, oldEndDate = _b.oldEndDate, endDateOpenedFirst = _b.endDateOpenedFirst, timeFormat = _b.curTimeFormat;
+        var _b = this.state; _b.startDate; var endDate = _b.endDate; _b.oldEndDate; var endDateOpenedFirst = _b.endDateOpenedFirst, timeFormat = _b.curTimeFormat;
         newValue = this.getEndDateByDuration(newValue);
         var editState = endDateOpenedFirst ? 'start' : 'end';
         var date = this.filterDate(newValue, {
@@ -780,7 +783,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             originValue: endDate,
             timeFormat: timeFormat,
             subControlViewMode: subControlViewMode,
-            autoInitDefaultValue: !!timeFormat && newValue && (!oldEndDate || !endDate)
+            autoInitDefaultValue: !!timeFormat && newValue && !endDate
         });
         this.setState({
             endDate: date,
@@ -819,7 +822,7 @@ var DateRangePicker = /** @class */ (function (_super) {
     };
     // 根据 duration 修复结束时间
     DateRangePicker.prototype.getEndDateByDuration = function (newValue) {
-        var _a = this.props, minDuration = _a.minDuration, maxDuration = _a.maxDuration, type = _a.type;
+        var _a = this.props, minDuration = _a.minDuration, maxDuration = _a.maxDuration, type = _a.type, maxDate = _a.maxDate;
         var _b = this.state, startDate = _b.startDate; _b.endDate; _b.editState;
         if (!startDate) {
             return newValue;
@@ -838,6 +841,9 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (maxDuration && newValue.isAfter(startDate.clone().add(maxDuration))) {
             newValue = startDate.clone().add(maxDuration);
         }
+        if (maxDate && newValue && newValue.isAfter(maxDate, 'second')) {
+            newValue = maxDate;
+        }
         return newValue;
     };
     // 根据 duration 修复起始时间
@@ -1205,7 +1211,7 @@ var DateRangePicker = /** @class */ (function (_super) {
                         ? this.handleStartDateChange
                         : viewMode === 'time'
                             ? this.handleTimeStartChange
-                            : this.handleDateChange, requiredConfirm: false, dateFormat: curDateFormat, displayForamt: displayFormat || inputFormat, timeFormat: curTimeFormat, isValidDate: this.checkStartIsValidDate, viewMode: viewMode, input: false, onClose: this.close, renderDay: this.renderDay, renderMonth: this.renderMonth, renderQuarter: this.renderQuarter, renderYear: this.renderYear, locale: locale, timeRangeHeader: "\u5F00\u59CB\u65F6\u95F4", embed: embed })),
+                            : this.handleDateChange, requiredConfirm: false, dateFormat: curDateFormat, displayForamt: displayFormat || inputFormat, timeFormat: curTimeFormat, isValidDate: this.checkStartIsValidDate, viewMode: viewMode, input: false, onClose: this.close, renderDay: this.renderDay, renderMonth: this.renderMonth, renderQuarter: this.renderQuarter, renderYear: this.renderYear, locale: locale, timeRangeHeader: "\u5F00\u59CB\u65F6\u95F4", embed: embed, status: "start" })),
                 (!isTimeRange ||
                     (editState === 'end' && !embed) ||
                     (mobileUI && isTimeRange)) && (_J$X_(Calendar["default"], { className: "".concat(ns, "DateRangePicker-end"), value: endDate, onChange: isDateTimeRange
@@ -1214,7 +1220,7 @@ var DateRangePicker = /** @class */ (function (_super) {
                             ? this.handleTimeEndChange
                             : this.handleDateChange, requiredConfirm: false, dateFormat: curDateFormat, displayForamt: displayFormat || inputFormat, timeFormat: curTimeFormat, viewDate: isDateTimeRange ? this.currentMonth : this.nextMonth, 
                     // isEndDate
-                    isValidDate: this.checkEndIsValidDate, viewMode: viewMode, input: false, onClose: this.close, renderDay: this.renderDay, renderMonth: this.renderMonth, renderQuarter: this.renderQuarter, renderYear: this.renderYear, locale: locale, timeRangeHeader: "\u7ED3\u675F\u65F6\u95F4", embed: embed }))),
+                    isValidDate: this.checkEndIsValidDate, viewMode: viewMode, input: false, onClose: this.close, renderDay: this.renderDay, renderMonth: this.renderMonth, renderQuarter: this.renderQuarter, renderYear: this.renderYear, locale: locale, timeRangeHeader: "\u7ED3\u675F\u65F6\u95F4", embed: embed, status: "end" }))),
             embed || mobileUI ? null : (_J$X_("div", { key: "button", className: "".concat(ns, "DateRangePicker-actions") },
                 _J$X_(Button["default"], { size: "sm", onClick: function () { return _this.close(); } }, __('cancel')),
                 _J$X_(Button["default"], { level: "primary", size: "sm", className: cx('m-l-sm'), disabled: isConfirmBtnDisbaled, onClick: this.confirm }, __('confirm'))))));

package/lib/components/DndContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */