amis-ui 3.5.2 → 3.6.0

package/lib/components/DateRangePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -665,16 +665,42 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (options === void 0) { options = { type: 'start' }; }
         var _a = options || {
             type: 'start'
-        }, type = _a.type, originValue = _a.originValue, timeFormat = _a.timeFormat, subControlViewMode = _a.subControlViewMode;
+        }, type = _a.type, originValue = _a.originValue, timeFormat = _a.timeFormat, subControlViewMode = _a.subControlViewMode, autoInitDefaultValue = _a.autoInitDefaultValue;
         var value = date.clone();
         var _b = this.props, transform = _b.transform, data = _b.data;
-        var transformFn = transform && typeof transform === 'string'
-            ? amisCore.str2function(transform, 'value', 'config', 'props', 'data', 'moment')
-            : transform;
+        var _c = this.state, startDate = _c.startDate, endDate = _c.endDate;
+        /** 此时为点选后的值初始化设置，不应该被内部转化逻辑和transformFn限制 */
+        if (autoInitDefaultValue === true) {
+            var now_1 = moment__default["default"]();
+            /** 如果已经设置了结束时间且当前时间已经超出了结束时间，则开始时间不能超过结束时间 */
+            if (!startDate && endDate && type === 'start' && now_1.isAfter(endDate)) {
+                value = endDate.clone();
+                return value;
+            }
+            var timePart_1 = {
+                date: value.get('date'),
+                hour: value.get('hour'),
+                minute: value.get('minute'),
+                second: value.get('second'),
+                millisecond: value.get('millisecond')
+            };
+            Object.keys(timePart_1).forEach(function (unit) {
+                /** 首次选择时间，日期使用当前时间; 将未设置过的时间字段设置为当前值 */
+                if ((unit === 'date' && subControlViewMode === 'time') ||
+                    (unit !== 'date' && timePart_1[unit] === 0)) {
+                    timePart_1[unit] = now_1.get(unit);
+                }
+            });
+            value.set(timePart_1);
+            return value;
+        }
         /** 日期时间选择器组件支持用户选择时间，如果用户手动选择了时间，则不需要走默认处理 */
         if (subControlViewMode && subControlViewMode === 'time') {
             return value;
         }
+        var transformFn = transform && typeof transform === 'string'
+            ? amisCore.str2function(transform, 'value', 'config', 'props', 'data', 'moment')
+            : transform;
         // 没有初始值
         if (!originValue) {
             value = value[type === 'start' ? 'startOf' : 'endOf']('day');
@@ -713,8 +739,8 @@ var DateRangePicker = /** @class */ (function (_super) {
      * @param {ViewMode=} subControlViewMode 子选择控件的类型，可选参数（'time'），用于区分datetime选择器的触发控件
      */
     DateRangePicker.prototype.handleStartDateChange = function (newValue, subControlViewMode) {
-        var _a = this.props, minDate = _a.minDate, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, type = _a.type;
-        var _b = this.state, startDate = _b.startDate, endDateOpenedFirst = _b.endDateOpenedFirst, timeFormat = _b.curTimeFormat;
+        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;
         if (minDate && newValue.isBefore(minDate)) {
             newValue = minDate;
         }
@@ -722,7 +748,8 @@ var DateRangePicker = /** @class */ (function (_super) {
             type: 'start',
             originValue: startDate || minDate,
             timeFormat: timeFormat,
-            subControlViewMode: subControlViewMode
+            subControlViewMode: subControlViewMode,
+            autoInitDefaultValue: !!timeFormat && newValue && (!oldStartDate || !startDate)
         });
         var newState = {
             startDate: date,
@@ -744,15 +771,16 @@ 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;
-        var _b = this.state; _b.startDate; var endDate = _b.endDate, endDateOpenedFirst = _b.endDateOpenedFirst, timeFormat = _b.curTimeFormat;
+        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;
         newValue = this.getEndDateByDuration(newValue);
         var editState = endDateOpenedFirst ? 'start' : 'end';
         var date = this.filterDate(newValue, {
             type: 'end',
             originValue: endDate,
             timeFormat: timeFormat,
-            subControlViewMode: subControlViewMode
+            subControlViewMode: subControlViewMode,
+            autoInitDefaultValue: !!timeFormat && newValue && (!oldEndDate || !endDate)
         });
         this.setState({
             endDate: date,

package/lib/components/DndContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Drawer.d.ts

@@ -62,11 +62,11 @@ export declare class Drawer extends React.Component<DrawerProps, DrawerState> {
     render(): React.JSX.Element;
 }
 declare const _default: {
-    new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-        showCloseButton?: boolean | undefined;
-        size?: any;
+    new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "onHide" | "show" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "width" | "height" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
         overlay?: boolean | undefined;
         container?: any;
+        size?: any;
+        showCloseButton?: boolean | undefined;
         position?: DrawerPosition | undefined;
     } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps): {
         ref: any;
@@ -74,19 +74,19 @@ declare const _default: {
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
-            size?: any;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "onHide" | "show" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "width" | "height" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             overlay?: boolean | undefined;
             container?: any;
+            size?: any;
+            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & 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<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
-            size?: any;
+        readonly props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "onHide" | "show" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "width" | "height" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             overlay?: boolean | undefined;
             container?: any;
+            size?: any;
+            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>;
         state: Readonly<{}>;
@@ -94,57 +94,57 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
-            size?: any;
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "onHide" | "show" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "width" | "height" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             overlay?: boolean | undefined;
             container?: any;
+            size?: any;
+            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
-            size?: any;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "onHide" | "show" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "width" | "height" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             overlay?: boolean | undefined;
             container?: any;
+            size?: any;
+            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
-            size?: any;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "onHide" | "show" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "width" | "height" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             overlay?: boolean | undefined;
             container?: any;
+            size?: any;
+            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
-            size?: any;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "onHide" | "show" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "width" | "height" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             overlay?: boolean | undefined;
             container?: any;
+            size?: any;
+            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
-            size?: any;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "onHide" | "show" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "width" | "height" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             overlay?: boolean | undefined;
             container?: any;
+            size?: any;
+            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
-            size?: any;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "onHide" | "show" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "width" | "height" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             overlay?: boolean | undefined;
             container?: any;
+            size?: any;
+            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "children" | "width" | "height" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "disabled" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
-            showCloseButton?: boolean | undefined;
-            size?: any;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "children" | "onHide" | "show" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "width" | "height" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             overlay?: boolean | undefined;
             container?: any;
+            size?: any;
+            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };

package/lib/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -15,6 +15,7 @@ var icons = require('./icons.js');
 var cx = require('classnames');
 var ModalManager = require('./ModalManager.js');
 var amisCore = require('amis-core');
+var Modal = require('./Modal.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -203,7 +204,7 @@ var Drawer = /** @class */ (function (_super) {
         var _this = this;
         var _a = this.props, ns = _a.classPrefix, className = _a.className, children = _a.children, container = _a.container, show = _a.show, showCloseButton = _a.showCloseButton, position = _a.position, size = _a.size, onHide = _a.onHide, disabled = _a.disabled, overlay = _a.overlay, bodyClassName = _a.bodyClassName, resizable = _a.resizable, drawerClassName = _a.drawerClassName, drawerMaskClassName = _a.drawerMaskClassName;
         var bodyStyle = this.getDrawerStyle();
-        return (_J$X_(Portal__default["default"], { container: container },
+        return (_J$X_(Portal__default["default"], { container: Modal.getContainerWithFullscreen(container) },
             _J$X_(Transition__default["default"], { mountOnEnter: true, unmountOnExit: true, appear: true, in: show, timeout: 500, onEnter: this.handleEnter, onExited: this.handleExited, onEntered: this.handleEntered }, function (status) {
                 var _a;
                 if (status === Transition.ENTERING) {