amis-ui 2.5.1 → 2.5.2

package/esm/components/404.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Alert.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Alert2.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ArrayInput.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/AsideNav.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/AssociatedSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Avatar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Badge.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/BaiduMapPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/BarCode.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Breadcrumb.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Button.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/CalendarMobile.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Cascader.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ChainedSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/CityArea.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/CityDB.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/CodeMirror.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ColorPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ConfirmBox.d.ts

@@ -11,6 +11,7 @@ export interface ConfirmBoxProps extends LocaleProps, ThemeProps {
     showTitle?: boolean;
     showFooter?: boolean;
     children?: JSX.Element | ((methods: {
+        loading?: boolean;
         bodyRef: React.MutableRefObject<{
             submit: () => Promise<Record<string, any>>;
         } | undefined>;

package/esm/components/ConfirmBox.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 
@@ -27,7 +27,7 @@ function ConfirmBox(_a) {
                     setLoading(true);
                     _d.label = 1;
                 case 1:
-                    _d.trys.push([1, 6, 7, 8]);
+                    _d.trys.push([1, 7, 8, 9]);
                     if (!beforeConfirm) return [3 /*break*/, 3];
                     return [4 /*yield*/, (beforeConfirm === null || beforeConfirm === void 0 ? void 0 : beforeConfirm(bodyRef.current))];
                 case 2:
@@ -46,16 +46,18 @@ function ConfirmBox(_a) {
                         setError(ret);
                         return [2 /*return*/];
                     }
-                    onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm(ret);
-                    return [3 /*break*/, 8];
+                    return [4 /*yield*/, (onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm(ret))];
                 case 6:
+                    _d.sent();
+                    return [3 /*break*/, 9];
+                case 7:
                     e_1 = _d.sent();
                     setError(e_1.message);
-                    return [3 /*break*/, 8];
-                case 7:
+                    return [3 /*break*/, 9];
+                case 8:
                     setLoading(false);
                     return [7 /*endfinally*/];
-                case 8: return [2 /*return*/];
+                case 9: return [2 /*return*/];
             }
         });
     }); }, [onConfirm, beforeConfirm]);
@@ -64,7 +66,8 @@ function ConfirmBox(_a) {
             showTitle !== false && title ? (React__default.createElement(FinalModal.Header, { onClose: onCancel, className: headerClassName }, title)) : null,
             React__default.createElement(FinalModal.Body, { className: bodyClassName }, typeof children === 'function'
                 ? children({
-                    bodyRef: bodyRef
+                    bodyRef: bodyRef,
+                    loading: loading
                 })
                 : children),
             (showFooter !== null && showFooter !== void 0 ? showFooter : true) ? (React__default.createElement(FinalModal.Footer, { className: footerClassName },

package/esm/components/ContextMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/DatePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/DateRangePicker.d.ts

@@ -5,7 +5,7 @@
  */
 /// <reference types="hoist-non-react-statics" />
 import React from 'react';
-import moment from 'moment';
+import moment, { unitOfTime } from 'moment';
 import { ShortCuts } from './DatePicker';
 import { ThemeProps } from 'amis-core';
 import type { PlainObject } from 'amis-core';
@@ -150,7 +150,7 @@ export declare class DateRangePicker extends React.Component<DateRangePickerProp
     renderQuarter(props: any, quarter: number, year: number): JSX.Element;
     renderYear(props: any, year: number): JSX.Element;
     renderCalendar(): JSX.Element;
-    getDisabledElementProps(currentDate: moment.Moment): {
+    getDisabledElementProps(currentDate: moment.Moment, granularity?: unitOfTime.StartOf): {
         className: string;
         onClick: undefined;
     } | {
@@ -411,13 +411,12 @@ declare const _default: {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }> & Readonly<{
-                /** 结束时间 */
                 children?: React.ReactNode;
             }>;
             state: Readonly<{}>;
             refs: {
                 [key: string]: React.ReactInstance;
-            }; /** 当前编辑的时间类型：开始时间 ｜ 结束时间 */
+            };
             componentDidMount?(): void;
             shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DateRangePickerProps, keyof LocaleProps>, "classPrefix" | "classnames" | "type" | "className" | "theme" | "data" | "embed" | "label" | "disabled" | "value" | "onFocus" | "onBlur" | "onChange" | "popoverClassName" | "popOverContainer" | "useMobileUI" | "borderMode" | "dateFormat" | "minDate" | "maxDate" | "timeFormat" | "viewMode" | "utc" | "minDuration" | "maxDuration" | "onRef" | "animation"> & Partial<Pick<Omit<DateRangePickerProps, keyof LocaleProps>, "delimiter" | "joinValues" | "clearable" | "resetValue" | "overlayPlacement" | "inputFormat" | "closeOnSelect" | "format" | "startPlaceholder" | "endPlaceholder" | "ranges">> & Partial<Pick<{
                 startPlaceholder: string;
@@ -607,13 +606,12 @@ declare const _default: {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }> & Readonly<{
-            /** 结束时间 */
             children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
-        }; /** 当前编辑的时间类型：开始时间 ｜ 结束时间 */
+        };
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DateRangePickerProps, keyof LocaleProps>, "classPrefix" | "classnames" | "type" | "className" | "theme" | "data" | "embed" | "label" | "disabled" | "value" | "onFocus" | "onBlur" | "onChange" | "popoverClassName" | "popOverContainer" | "useMobileUI" | "borderMode" | "dateFormat" | "minDate" | "maxDate" | "timeFormat" | "viewMode" | "utc" | "minDuration" | "maxDuration" | "onRef" | "animation"> & Partial<Pick<Omit<DateRangePickerProps, keyof LocaleProps>, "delimiter" | "joinValues" | "clearable" | "resetValue" | "overlayPlacement" | "inputFormat" | "closeOnSelect" | "format" | "startPlaceholder" | "endPlaceholder" | "ranges">> & Partial<Pick<{
             startPlaceholder: string;
@@ -803,13 +801,12 @@ declare const _default: {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }> & Readonly<{
-                /** 结束时间 */
                 children?: React.ReactNode;
             }>;
             state: Readonly<{}>;
             refs: {
                 [key: string]: React.ReactInstance;
-            }; /** 当前编辑的时间类型：开始时间 ｜ 结束时间 */
+            };
             componentDidMount?(): void;
             shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DateRangePickerProps, keyof LocaleProps>, "classPrefix" | "classnames" | "type" | "className" | "theme" | "data" | "embed" | "label" | "disabled" | "value" | "onFocus" | "onBlur" | "onChange" | "popoverClassName" | "popOverContainer" | "useMobileUI" | "borderMode" | "dateFormat" | "minDate" | "maxDate" | "timeFormat" | "viewMode" | "utc" | "minDuration" | "maxDuration" | "onRef" | "animation"> & Partial<Pick<Omit<DateRangePickerProps, keyof LocaleProps>, "delimiter" | "joinValues" | "clearable" | "resetValue" | "overlayPlacement" | "inputFormat" | "closeOnSelect" | "format" | "startPlaceholder" | "endPlaceholder" | "ranges">> & Partial<Pick<{
                 startPlaceholder: string;

package/esm/components/DateRangePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 
@@ -952,7 +952,7 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (endDate && currentDate.isSame(endDate, 'day')) {
             props.className += ' rdtActive rdtEndDay';
         }
-        var _b = this.getDisabledElementProps(currentDate), className = _b.className, others = __rest(_b, ["className"]);
+        var _b = this.getDisabledElementProps(currentDate, 'day'), className = _b.className, others = __rest(_b, ["className"]);
         props.className += className;
         return (React__default.createElement("td", __assign({}, omit(props, ['todayActiveStyle']), others),
             React__default.createElement("span", null, currentDate.date())));
@@ -969,7 +969,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             currentDate.isBetween(startDate, endDate, 'month', '[]')) {
             props.className += ' rdtBetween';
         }
-        var _b = this.getDisabledElementProps(currentDate), className = _b.className, others = __rest(_b, ["className"]);
+        var _b = this.getDisabledElementProps(currentDate, 'month'), className = _b.className, others = __rest(_b, ["className"]);
         props.className += className;
         return (React__default.createElement("td", __assign({}, props, others),
             React__default.createElement("span", null, monthStrFixedLength)));
@@ -982,7 +982,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             currentDate.isBetween(startDate, endDate, 'quarter', '[]')) {
             props.className += ' rdtBetween';
         }
-        var _b = this.getDisabledElementProps(currentDate), className = _b.className, others = __rest(_b, ["className"]);
+        var _b = this.getDisabledElementProps(currentDate, 'quarter'), className = _b.className, others = __rest(_b, ["className"]);
         props.className += className;
         return (React__default.createElement("td", __assign({}, props, others),
             React__default.createElement("span", null,
@@ -997,7 +997,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             currentDate.isBetween(startDate, endDate, 'year', '[]')) {
             props.className += ' rdtBetween';
         }
-        var _b = this.getDisabledElementProps(currentDate), className = _b.className, others = __rest(_b, ["className"]);
+        var _b = this.getDisabledElementProps(currentDate, 'year'), className = _b.className, others = __rest(_b, ["className"]);
         props.className += className;
         return (React__default.createElement("td", __assign({}, props, others),
             React__default.createElement("span", null, year)));
@@ -1044,10 +1044,11 @@ var DateRangePicker = /** @class */ (function (_super) {
                         'is-disabled': isConfirmBtnDisbaled
                     }), onClick: this.confirm }, __('confirm'))))));
     };
-    DateRangePicker.prototype.getDisabledElementProps = function (currentDate) {
+    DateRangePicker.prototype.getDisabledElementProps = function (currentDate, granularity) {
         var _a = this.state; _a.endDateOpenedFirst; var endDate = _a.endDate, startDate = _a.startDate, editState = _a.editState;
-        var afterEndDate = editState === 'start' && currentDate > endDate;
-        var beforeStartDate = editState === 'end' && currentDate < startDate;
+        var afterEndDate = editState === 'start' && currentDate.isAfter(endDate, granularity);
+        var beforeStartDate = editState === 'end' &&
+            !currentDate.isSameOrAfter(startDate, granularity);
         if (afterEndDate || beforeStartDate) {
             return {
                 className: ' is-disabled',

package/esm/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Form.d.ts

@@ -10,8 +10,10 @@ export type FormRef = React.MutableRefObject<{
 } | undefined>;
 export interface FormProps extends ThemeProps, LocaleProps {
     defaultValue?: any;
+    value?: any;
     autoSubmit?: boolean;
     onValidate?: (errors: any, values: any) => Promise<void>;
+    onChange?: (value: any) => void;
     onSubmit?: (value: any) => void;
     forwardRef?: FormRef;
     children?: (methods: UseFormReturn & {

package/esm/components/Form.js

@@ -1,20 +1,20 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 
 import { __assign } from 'tslib';
 import React__default from 'react';
-import { themeable, localeable, noop } from 'amis-core';
+import { themeable, localeable, noop, isObjectShallowModified } from 'amis-core';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useValidationResolver } from '../hooks/use-validation-resolver.js';
 import debounce from 'lodash/debounce';
 
 function Form(props) {
-    var _a;
-    var cx = props.classnames, className = props.className, autoSubmit = props.autoSubmit;
+    var _a, _b;
+    var cx = props.classnames, className = props.className, autoSubmit = props.autoSubmit, value = props.value, onChange = props.onChange;
     var methods = useForm({
-        defaultValues: props.defaultValue,
+        defaultValues: (_a = props.value) !== null && _a !== void 0 ? _a : props.defaultValue,
         resolver: useValidationResolver(props.translate, props.onValidate)
     });
     var onSubmit = React__default.useRef(methods.handleSubmit(props.onSubmit || noop));
@@ -33,6 +33,21 @@ function Form(props) {
             };
         }, []);
     }
+    React__default.useEffect(function () {
+        if (value && isObjectShallowModified(value, methods.getValues())) {
+            Object.keys(value).forEach(function (key) {
+                methods.setValue(key, value[key]);
+            });
+        }
+    }, [value]);
+    if (onChange) {
+        React__default.useEffect(function () {
+            var subscriber = methods.watch(function (value) {
+                onChange(value);
+            });
+            return function () { return subscriber.unsubscribe(); };
+        }, [onChange]);
+    }
     React__default.useEffect(function () {
         if (props.forwardRef) {
             // 这个模式别的组件没见到过不知道后续会不会不允许
@@ -56,8 +71,8 @@ function Form(props) {
     });
     return (React__default.createElement(FormProvider, __assign({}, methods),
         React__default.createElement("form", { className: cx('Form', className), onSubmit: onSubmit.current, noValidate: true },
-            React__default.createElement("input", { type: "submit", style: { display: 'none' } }), (_a = props.children) === null || _a === void 0 ? void 0 :
-            _a.call(props, __assign(__assign({}, methods), { onSubmit: onSubmit.current })))));
+            React__default.createElement("input", { type: "submit", style: { display: 'none' } }), (_b = props.children) === null || _b === void 0 ? void 0 :
+            _b.call(props, __assign(__assign({}, methods), { onSubmit: onSubmit.current })))));
 }
 var ThemedForm = themeable(localeable(Form));
 var Form$1 = React__default.forwardRef(function (props, ref) { return (React__default.createElement(ThemedForm, __assign({}, props, { forwardRef: ref }))); });

package/esm/components/FormField.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/GroupedSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Html.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ImageGallery.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Input.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/InputBox.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/InputBoxWithSuggestion.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ListGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ListMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/LocationPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Markdown.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ModalManager.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/MultilineText.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */
 

package/esm/components/NumberInput.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.5.1
+ * amis-ui v2.5.2
  * Copyright 2018-2022 fex
  */