amis-ui 6.0.0 → 6.2.0

package/lib/components/DateRangePicker.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -410,8 +410,8 @@ var DateRangePicker = /** @class */ (function (_super) {
         _this.renderYear = _this.renderYear.bind(_this);
         _this.handleMobileChange = _this.handleMobileChange.bind(_this);
         _this.handleOutClick = _this.handleOutClick.bind(_this);
-        var _a = _this.props, format = _a.format, valueFormat = _a.valueFormat, joinValues = _a.joinValues, delimiter = _a.delimiter, value = _a.value, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, dateFormat = _a.dateFormat, timeFormat = _a.timeFormat;
-        var _b = DateRangePicker.unFormatValue(value, valueFormat || format, joinValues, delimiter), startDate = _b.startDate, endDate = _b.endDate;
+        var _a = _this.props, format = _a.format, valueFormat = _a.valueFormat, joinValues = _a.joinValues, delimiter = _a.delimiter, value = _a.value, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, dateFormat = _a.dateFormat, timeFormat = _a.timeFormat, data = _a.data;
+        var _b = DateRangePicker.unFormatValue(value, valueFormat || format, joinValues, delimiter, data), startDate = _b.startDate, endDate = _b.endDate;
         var curDateFormat = dateFormat !== null && dateFormat !== void 0 ? dateFormat : '';
         var curTimeFormat = timeFormat !== null && timeFormat !== void 0 ? timeFormat : '';
         var curTimeFormatArr = [];
@@ -461,7 +461,7 @@ var DateRangePicker = /** @class */ (function (_super) {
         return newValue;
     };
     /* 将日期时间转化为momemnt格式，如果输入的内容不合法则返回undefined */
-    DateRangePicker.unFormatValue = function (value, format, joinValues, delimiter) {
+    DateRangePicker.unFormatValue = function (value, format, joinValues, delimiter, data) {
         if (!value) {
             return {
                 startDate: undefined,
@@ -471,8 +471,8 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (joinValues && typeof value === 'string') {
             value = value.split(delimiter);
         }
-        var startDate = moment__default["default"](value === null || value === void 0 ? void 0 : value[0], format);
-        var endDate = moment__default["default"](value === null || value === void 0 ? void 0 : value[1], format);
+        var startDate = amisCore.filterDate(value === null || value === void 0 ? void 0 : value[0], data, format);
+        var endDate = amisCore.filterDate(value === null || value === void 0 ? void 0 : value[1], data, format);
         /**
          * 不合法的value输入都丢弃
          * 注意undefined被moment认为是合法的输入，moment会转化为now，所以需要结合在一起判断
@@ -506,7 +506,7 @@ var DateRangePicker = /** @class */ (function (_super) {
     };
     DateRangePicker.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
-        var value = props.value, format = props.format, valueFormat = props.valueFormat, joinValues = props.joinValues, inputFormat = props.inputFormat, displayFormat = props.displayFormat, dateFormat = props.dateFormat, timeFormat = props.timeFormat, delimiter = props.delimiter;
+        var value = props.value, format = props.format, valueFormat = props.valueFormat, joinValues = props.joinValues, inputFormat = props.inputFormat, displayFormat = props.displayFormat, dateFormat = props.dateFormat, timeFormat = props.timeFormat, delimiter = props.delimiter, data = props.data;
         if (prevProps.displayFormat != displayFormat ||
             prevProps.inputFormat != inputFormat) {
             var curDateFormat_1 = dateFormat !== null && dateFormat !== void 0 ? dateFormat : '';
@@ -534,7 +534,7 @@ var DateRangePicker = /** @class */ (function (_super) {
             });
         }
         if (prevProps.value !== value) {
-            var _a = DateRangePicker.unFormatValue(value, valueFormat || format, joinValues, delimiter), startDate = _a.startDate, endDate = _a.endDate;
+            var _a = DateRangePicker.unFormatValue(value, valueFormat || format, joinValues, delimiter, data), startDate = _a.startDate, endDate = _a.endDate;
             this.setState({
                 startDate: startDate,
                 endDate: endDate,
@@ -604,8 +604,8 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (isConfirm === void 0) { isConfirm = false; }
         if (!isConfirm) {
             /** 未点击确认关闭时，将日期恢复至未做任何选择的状态 */
-            var _a = this.props, value = _a.value, format = _a.format, valueFormat = _a.valueFormat, joinValues = _a.joinValues, delimiter = _a.delimiter, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat;
-            var _b = DateRangePicker.unFormatValue(value, valueFormat || format, joinValues, delimiter), startDate = _b.startDate, endDate = _b.endDate;
+            var _a = this.props, value = _a.value, format = _a.format, valueFormat = _a.valueFormat, joinValues = _a.joinValues, delimiter = _a.delimiter, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, data = _a.data;
+            var _b = DateRangePicker.unFormatValue(value, valueFormat || format, joinValues, delimiter, data), startDate = _b.startDate, endDate = _b.endDate;
             this.setState({
                 startDate: startDate,
                 endDate: endDate,
@@ -1035,11 +1035,11 @@ var DateRangePicker = /** @class */ (function (_super) {
     };
     // 重置
     DateRangePicker.prototype.reset = function () {
-        var _a = this.props, resetValue = _a.resetValue, onChange = _a.onChange, format = _a.format, valueFormat = _a.valueFormat, joinValues = _a.joinValues, delimiter = _a.delimiter, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat;
+        var _a = this.props, resetValue = _a.resetValue, onChange = _a.onChange, format = _a.format, valueFormat = _a.valueFormat, joinValues = _a.joinValues, delimiter = _a.delimiter, inputFormat = _a.inputFormat, displayFormat = _a.displayFormat, data = _a.data;
         if (!resetValue) {
             return;
         }
-        var _b = DateRangePicker.unFormatValue(resetValue, valueFormat || format, joinValues, delimiter), startDate = _b.startDate, endDate = _b.endDate;
+        var _b = DateRangePicker.unFormatValue(resetValue, valueFormat || format, joinValues, delimiter, data), startDate = _b.startDate, endDate = _b.endDate;
         onChange(resetValue);
         this.setState({
             startInputValue: startDate === null || startDate === void 0 ? void 0 : startDate.format(displayFormat || inputFormat),
@@ -1115,11 +1115,15 @@ var DateRangePicker = /** @class */ (function (_super) {
             currentDate.isBetween(startDate, endDate, 'day', '[]')) {
             props.className += ' rdtBetween';
         }
+        // 如果已经选择了开始时间和结束时间，那么中间的时间都不应该高亮
+        if (startDate && endDate && props.className.includes('rdtActive')) {
+            props.className = props.className.replace('rdtActive', '');
+        }
         if (startDate && currentDate.isSame(startDate, 'day')) {
-            props.className += ' rdtActive rdtStartDay';
+            props.className += ' rdtActive rdtStart';
         }
         if (endDate && currentDate.isSame(endDate, 'day')) {
-            props.className += ' rdtActive rdtEndDay';
+            props.className += ' rdtActive rdtEnd';
         }
         var _b = this.getDisabledElementProps(currentDate, 'day'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
@@ -1140,6 +1144,16 @@ var DateRangePicker = /** @class */ (function (_super) {
             currentDate.isBetween(startDate, endDate, 'month', '[]')) {
             props.className += ' rdtBetween';
         }
+        // 如果已经选择了开始时间和结束时间，那么中间的时间都不应该高亮
+        if (startDate && endDate && props.className.includes('rdtActive')) {
+            props.className = props.className.replace('rdtActive', '');
+        }
+        if (startDate && currentDate.isSame(startDate, 'month')) {
+            props.className += ' rdtActive rdtStart';
+        }
+        if (endDate && currentDate.isSame(endDate, 'month')) {
+            props.className += ' rdtActive rdtEnd';
+        }
         var _b = this.getDisabledElementProps(currentDate, 'month'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
         return (_J$X_("td", tslib.__assign({}, omit__default["default"](props, 'viewDate'), others),
@@ -1153,6 +1167,16 @@ var DateRangePicker = /** @class */ (function (_super) {
             currentDate.isBetween(startDate, endDate, 'quarter', '[]')) {
             props.className += ' rdtBetween';
         }
+        // 如果已经选择了开始时间和结束时间，那么中间的时间都不应该高亮
+        if (startDate && endDate && props.className.includes('rdtActive')) {
+            props.className = props.className.replace('rdtActive', '');
+        }
+        if (startDate && currentDate.isSame(startDate, 'quarter')) {
+            props.className += ' rdtActive rdtStart';
+        }
+        if (endDate && currentDate.isSame(endDate, 'quarter')) {
+            props.className += ' rdtActive rdtEnd';
+        }
         var _b = this.getDisabledElementProps(currentDate, 'quarter'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
         return (_J$X_("td", tslib.__assign({}, props, others),
@@ -1168,6 +1192,16 @@ var DateRangePicker = /** @class */ (function (_super) {
             currentDate.isBetween(startDate, endDate, 'year', '[]')) {
             props.className += ' rdtBetween';
         }
+        // 如果已经选择了开始时间和结束时间，那么中间的时间都不应该高亮
+        if (startDate && endDate && props.className.includes('rdtActive')) {
+            props.className = props.className.replace('rdtActive', '');
+        }
+        if (startDate && currentDate.isSame(startDate, 'year')) {
+            props.className += ' rdtActive rdtStart';
+        }
+        if (endDate && currentDate.isSame(endDate, 'year')) {
+            props.className += ' rdtActive rdtEnd';
+        }
         var _b = this.getDisabledElementProps(currentDate, 'year'), className = _b.className, others = tslib.__rest(_b, ["className"]);
         props.className += className;
         return (_J$X_("td", tslib.__assign({}, props, others),

package/lib/components/DndContainer.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

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;
+    new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "width" | "height" | "children" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
         size?: any;
         overlay?: boolean | undefined;
         container?: 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;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "width" | "height" | "children" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
             overlay?: boolean | undefined;
             container?: 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;
+        readonly props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "width" | "height" | "children" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
             overlay?: boolean | undefined;
             container?: 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;
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "width" | "height" | "children" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
             overlay?: boolean | undefined;
             container?: 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;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "width" | "height" | "children" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
             overlay?: boolean | undefined;
             container?: 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;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "width" | "height" | "children" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
             overlay?: boolean | undefined;
             container?: 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;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "width" | "height" | "children" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
             overlay?: boolean | undefined;
             container?: 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;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "width" | "height" | "children" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
             overlay?: boolean | undefined;
             container?: 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;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "width" | "height" | "children" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
             overlay?: boolean | undefined;
             container?: 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;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "disabled" | "width" | "height" | "children" | "show" | "onHide" | "onEntered" | "onExited" | "closeOnEsc" | "bodyClassName" | "closeOnOutside" | "resizable" | "drawerClassName" | "drawerMaskClassName"> & {
             size?: any;
             overlay?: boolean | undefined;
             container?: 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,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';