amis-ui 3.6.2 → 6.0.0

package/esm/components/TransferDropDown.js

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

package/esm/components/TransferPicker.js

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

package/esm/components/TransferSearch.js

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

package/esm/components/Tree.js

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

package/esm/components/TreeSelection.js

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

package/esm/components/UserSelect.js

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

package/esm/components/UserTabSelect.js

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

package/esm/components/WithRemoteConfig.js

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

package/esm/components/WithStore.js

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

package/esm/components/calendar/Calendar.d.ts

@@ -12,6 +12,7 @@ export type ViewMode = 'days' | 'months' | 'years' | 'time' | 'quarters';
 export type DateType = 'year' | 'month' | 'date' | 'hours' | 'minutes' | 'seconds';
 /** 底层View组件修改的值类型：time时间、days日期 */
 export type ChangeEventViewMode = Extract<ViewMode, 'time' | 'days'>;
+export type ChangeEventViewStatus = 'start' | 'end';
 /** 可改变的时间单位 */
 export type MutableUnitOfTime = Extract<unitOfTime.All, 'date' | 'hour' | 'minute' | 'second' | 'millisecond'>;
 export interface BoundaryObject {
@@ -45,7 +46,7 @@ interface BaseDatePickerProps {
     onMouseEnter?: (date: moment.Moment) => any;
     onMouseLeave?: (date: moment.Moment) => any;
     onClose?: () => void;
-    onChange?: (value: any, viewMode?: ChangeEventViewMode) => void;
+    onChange?: (value: any, viewMode?: ChangeEventViewMode, status?: ChangeEventViewStatus) => void;
     isEndDate?: boolean;
     minDate?: moment.Moment;
     maxDate?: moment.Moment;
@@ -75,6 +76,7 @@ interface BaseDatePickerProps {
     displayTimeZone?: string;
     timeConstraints?: any;
     timeRangeHeader?: string;
+    status?: ChangeEventViewStatus;
 }
 declare const _default: React.ComponentType<BaseDatePickerProps>;
 export default _default;

package/esm/components/calendar/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -160,10 +160,11 @@ var BaseDatePicker = /** @class */ (function (_super) {
         };
         _this.updateSelectedDate = function (e, close) {
             var that = _this;
+            var _a = that.props, embed = _a.embed, status = _a.status;
             var date = that.getTargetDate(e);
             if (!_this.props.value) {
                 var open = !(_this.props.closeOnSelect && close);
-                if (!open) {
+                if (!open && !embed) {
                     that.props.onBlur(date);
                 }
                 _this.setState({
@@ -183,7 +184,7 @@ var BaseDatePicker = /** @class */ (function (_super) {
                     that.closeCalendar();
                 }
             }
-            that.props.onChange(date, 'days');
+            that.props.onChange(date, 'days', status);
         };
         _this.getDateBoundary = function (currentDate) {
             var _a, _b;

package/esm/components/calendar/CalendarContainer.js

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

package/esm/components/calendar/DaysView.js

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

package/esm/components/calendar/MonthsView.js

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

package/esm/components/calendar/QuartersView.js

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

package/esm/components/calendar/TimeView.d.ts

@@ -68,8 +68,11 @@ export declare class CustomTimeView extends React.Component<CustomTimeViewProps
     };
     timer?: any;
     increaseTimer?: any;
+    /** 基于 timeConstraints 计算出的时间列表 */
+    timeList: string[];
     constructor(props: any);
     componentDidMount(): void;
+    shoudExtractTimeConstraintsList: () => boolean;
     updateSelectedDate: (event: React.MouseEvent<any>) => void;
     componentDidUpdate(preProps: CustomTimeViewProps): void;
     onStartClicking(action: any, type: string): () => void;
@@ -100,6 +103,9 @@ export declare class CustomTimeView extends React.Component<CustomTimeViewProps
     renderTimeViewPicker: () => React.JSX.Element;
     setTime: (type: TimeScale, value: number) => void;
     scrollToTop: (type: TimeScale, value: number, i: number, label?: string) => void;
+    /**
+     * 选择当前时间，如果设置了timeConstraints，则选择最接近的时间
+     */
     selectNowTime: () => void;
     confirm: () => void;
     cancel: () => void;

package/esm/components/calendar/TimeView.js

@@ -1,13 +1,13 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
-import { __extends, __assign } from 'tslib';
+import { __extends, __assign, __values } from 'tslib';
 import moment from 'moment';
 import React__default from 'react';
 import merge from 'lodash/merge';
-import { getRange, localeable } from 'amis-core';
+import { isObject, getRange, localeable } from 'amis-core';
 import { Icon } from '../icons.js';
 import Picker from '../Picker.js';
 import Downshift from 'downshift';
@@ -44,6 +44,31 @@ var CustomTimeView = /** @class */ (function (_super) {
                 step: 1
             }
         };
+        /** 基于 timeConstraints 计算出的时间列表 */
+        _this.timeList = [];
+        _this.shoudExtractTimeConstraintsList = function () {
+            var timeConstraints = _this.timeConstraints;
+            var result = false;
+            if (!timeConstraints || !isObject(timeConstraints)) {
+                return result;
+            }
+            ['hours', 'minutes', 'seconds'].forEach(function (timeScale) {
+                var _a = timeConstraints[timeScale], min = _a.min, max = _a.max, step = _a.step;
+                if (result !== false) {
+                    return;
+                }
+                if (timeScale === 'hours') {
+                    result = min > 0 || max < 23 || step > 1;
+                }
+                else if (timeScale === 'minutes') {
+                    result = min > 0 || max < 59 || step > 1;
+                }
+                else if (timeScale === 'seconds') {
+                    result = min > 0 || max < 59 || step > 1;
+                }
+            });
+            return result;
+        };
         _this.updateSelectedDate = function (event) {
             // need confirm
             if (_this.props.requiredConfirm) {
@@ -207,13 +232,33 @@ var CustomTimeView = /** @class */ (function (_super) {
                 behavior: label === 'init' ? 'auto' : 'smooth'
             });
         };
+        /**
+         * 选择当前时间，如果设置了timeConstraints，则选择最接近的时间
+         */
         _this.selectNowTime = function () {
-            _this.props.setDateTimeState({
-                viewDate: moment().clone(),
-                selectedDate: moment().clone()
-            }, function () {
-                _this.confirm();
-            });
+            var _a = _this.props, setDateTimeState = _a.setDateTimeState, timeFormat = _a.timeFormat;
+            var useClosetDate = _this.shoudExtractTimeConstraintsList();
+            if (useClosetDate) {
+                var timeList = _this.timeList;
+                var now_1 = moment().clone();
+                var closetDate_1 = now_1.clone();
+                var minDiff_1 = Infinity;
+                /** 遍历时间列表，找出最接近此刻的时间 */
+                timeList.forEach(function (item, index) {
+                    var date = moment(item, timeFormat);
+                    var diff = Math.abs(now_1.diff(date));
+                    if (diff < minDiff_1) {
+                        minDiff_1 = diff;
+                        closetDate_1 = date;
+                    }
+                });
+                setDateTimeState({ viewDate: closetDate_1, selectedDate: closetDate_1 }, function () {
+                    return _this.confirm();
+                });
+            }
+            else {
+                setDateTimeState({ viewDate: moment().clone(), selectedDate: moment().clone() }, function () { return _this.confirm(); });
+            }
         };
         _this.confirm = function () {
             var _a, _b;
@@ -238,8 +283,9 @@ var CustomTimeView = /** @class */ (function (_super) {
         return _this;
     }
     CustomTimeView.prototype.componentDidMount = function () {
+        var e_1, _a, e_2, _b, e_3, _c;
         var _this = this;
-        var _a = this.props, timeFormat = _a.timeFormat, selectedDate = _a.selectedDate, viewDate = _a.viewDate, isEndDate = _a.isEndDate;
+        var _d = this.props, timeFormat = _d.timeFormat, selectedDate = _d.selectedDate, viewDate = _d.viewDate, isEndDate = _d.isEndDate;
         var formatMap = {
             hours: 'HH',
             minutes: 'mm',
@@ -258,6 +304,55 @@ var CustomTimeView = /** @class */ (function (_super) {
                 _this.scrollToTop(type, parseInt(date.format(formatMap[type]), 10), i, 'init');
             }
         });
+        /** 如果设置了step或者min、max限制，则计算出时间列表提供给后续使用 */
+        if (this.shoudExtractTimeConstraintsList()) {
+            var hours = this.computedTimeOptions('hours').map(function (item) { return item.value; });
+            var minutes = timeFormat.split(':').some(function (f) { return /^(mm|m)$/.test(f); })
+                ? this.computedTimeOptions('minutes').map(function (item) { return item.value; })
+                : ['00'];
+            var seconds = timeFormat.split(':').some(function (f) { return /^(ss|s)$/.test(f); })
+                ? this.computedTimeOptions('seconds').map(function (item) { return item.value; })
+                : ['00'];
+            var result = [];
+            try {
+                for (var hours_1 = __values(hours), hours_1_1 = hours_1.next(); !hours_1_1.done; hours_1_1 = hours_1.next()) {
+                    var h = hours_1_1.value;
+                    try {
+                        for (var minutes_1 = (e_2 = void 0, __values(minutes)), minutes_1_1 = minutes_1.next(); !minutes_1_1.done; minutes_1_1 = minutes_1.next()) {
+                            var m = minutes_1_1.value;
+                            try {
+                                for (var seconds_1 = (e_3 = void 0, __values(seconds)), seconds_1_1 = seconds_1.next(); !seconds_1_1.done; seconds_1_1 = seconds_1.next()) {
+                                    var s = seconds_1_1.value;
+                                    result.push("".concat(h, ":").concat(m, ":").concat(s));
+                                }
+                            }
+                            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                            finally {
+                                try {
+                                    if (seconds_1_1 && !seconds_1_1.done && (_c = seconds_1.return)) _c.call(seconds_1);
+                                }
+                                finally { if (e_3) throw e_3.error; }
+                            }
+                        }
+                    }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (minutes_1_1 && !minutes_1_1.done && (_b = minutes_1.return)) _b.call(minutes_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (hours_1_1 && !hours_1_1.done && (_a = hours_1.return)) _a.call(hours_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            this.timeList = result;
+        }
     };
     CustomTimeView.prototype.componentDidUpdate = function (preProps) {
         if (preProps.viewDate !== this.props.viewDate ||

package/esm/components/calendar/YearsView.js

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

package/esm/components/condition-builder/Expression.js

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

package/esm/components/condition-builder/Field.js

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

package/esm/components/condition-builder/Func.js

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

package/esm/components/condition-builder/Group.js

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

package/esm/components/condition-builder/GroupOrItem.js

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

package/esm/components/condition-builder/InputSwitch.js

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

package/esm/components/condition-builder/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -48,9 +48,14 @@ var ConditionItem = /** @class */ (function (_super) {
     };
     ConditionItem.prototype.handleOperatorChange = function (op) {
         var _a;
-        var _b = this.props, fields = _b.fields, value = _b.value, index = _b.index, onChange = _b.onChange;
+        var _b = this.props, fields = _b.fields, value = _b.value, index = _b.index, onChange = _b.onChange, formula = _b.formula;
+        var useFormulaInput = (formula === null || formula === void 0 ? void 0 : formula.mode) === 'input-group' && (formula === null || formula === void 0 ? void 0 : formula.inputSettings);
         var leftFieldSchema = findTree(fields, function (i) { var _a; return i.name === ((_a = value === null || value === void 0 ? void 0 : value.left) === null || _a === void 0 ? void 0 : _a.field); });
-        var result = __assign(__assign({}, value), { op: op, right: (_a = value.right) !== null && _a !== void 0 ? _a : leftFieldSchema === null || leftFieldSchema === void 0 ? void 0 : leftFieldSchema.defaultValue });
+        var result = __assign(__assign({}, value), { op: op, 
+            /** 使用公式编辑器模式时，因为不同条件下值格式不一致（比如select类型下包含和等于对应的multiple会变化），所以变化条件时需要清空right值 */
+            right: useFormulaInput
+                ? leftFieldSchema === null || leftFieldSchema === void 0 ? void 0 : leftFieldSchema.defaultValue
+                : (_a = value.right) !== null && _a !== void 0 ? _a : leftFieldSchema === null || leftFieldSchema === void 0 ? void 0 : leftFieldSchema.defaultValue });
         onChange(result, index);
     };
     ConditionItem.prototype.handleRightChange = function (rightValue) {
@@ -110,12 +115,12 @@ var ConditionItem = /** @class */ (function (_super) {
                     return operator;
                 }
             });
-            return (React__default.createElement(PopOverContainer, { mobileUI: mobileUI, popOverContainer: popOverContainer || (function () { return findDOMNode(_this); }), popOverRender: function (_a) {
+            return (React__default.createElement(PopOverContainer, { mobileUI: mobileUI, disabled: operators.length < 2, popOverContainer: popOverContainer || (function () { return findDOMNode(_this); }), popOverRender: function (_a) {
                     var onClose = _a.onClose;
                     return (React__default.createElement(GroupedSelection, { onClick: onClose, option2value: option2value, onChange: _this.handleOperatorChange, options: options_1, value: value.op, multiple: false }));
                 } }, function (_a) {
                 var _b;
-                var onClick = _a.onClick, isOpened = _a.isOpened, ref = _a.ref;
+                var onClick = _a.onClick, isOpened = _a.isOpened, ref = _a.ref; _a.disabled;
                 return (React__default.createElement("div", { className: cx('CBGroup-operator') },
                     React__default.createElement(ResultBox, { className: cx('CBGroup-operatorInput', isOpened ? 'is-active' : ''), ref: ref, allowInput: false, result: __1(OperationMap[value === null || value === void 0 ? void 0 : value.op]) ||
                             ((_b = options_1.find(function (option) { return option.value === value.op; })) === null || _b === void 0 ? void 0 : _b.label), onResultChange: noop, onResultClick: onClick, disabled: disabled, placeholder: __1('Condition.cond_placeholder'), mobileUI: mobileUI }, !mobileUI ? (React__default.createElement("span", { className: cx('CBGroup-operatorCaret') },

package/esm/components/condition-builder/Value.js

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

package/esm/components/condition-builder/config.js

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

package/esm/components/condition-builder/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -169,9 +169,18 @@ var QueryBuilder = /** @class */ (function (_super) {
         if (embed) {
             return this.renderBody(onFinalChange, value, popOverContainer);
         }
+        /** 因为 ConditionBuilder特殊的数据结构，提供给 ResultBox 的需要处理一下 */
+        var resultBoxValue = embed === false
+            ? !value ||
+                !(value === null || value === void 0 ? void 0 : value.hasOwnProperty('children')) ||
+                !Array.isArray(value.children) ||
+                value.children.length < 1
+                ? undefined
+                : value
+            : value;
         return (React__default.createElement(PickerContainer, { classnames: cx, classPrefix: classPrefix, translate: translate, locale: locale, onConfirm: onFinalChange, value: value, size: 'md', popOverContainer: popOverContainer, bodyRender: function (params) { return _this.renderBody(params.onChange, params.value); }, title: title }, function (_a) {
             var onClick = _a.onClick, isOpened = _a.isOpened;
-            return (React__default.createElement(ResultBox, { classnames: cx, classPrefix: classPrefix, translate: translate, locale: locale, className: cx('CBGroup-result', { 'is-active': isOpened }), allowInput: false, clearable: true, result: value, itemRender: _this.highlightValue, onResultChange: noop, onClear: _this.handleClear, disabled: disabled, borderMode: 'full', placeholder: placeholder, actions: pickerIcon && (React__default.createElement("span", { className: cx('CBPicker-trigger'), onClick: onClick }, pickerIcon)), mobileUI: mobileUI, onResultClick: onClick }));
+            return (React__default.createElement(ResultBox, { classnames: cx, classPrefix: classPrefix, translate: translate, locale: locale, className: cx('CBGroup-result', { 'is-active': isOpened }), allowInput: false, clearable: true, result: resultBoxValue, itemRender: _this.highlightValue, onResultChange: noop, onClear: _this.handleClear, disabled: disabled, borderMode: 'full', placeholder: placeholder, actions: pickerIcon && (React__default.createElement("span", { className: cx('CBPicker-trigger'), onClick: onClick }, pickerIcon)), mobileUI: mobileUI, onResultClick: onClick }));
         }));
     };
     __decorate([

package/esm/components/formula/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -70,6 +70,15 @@ var FormulaEditor = /** @class */ (function (_super) {
         if (!Array.isArray(variables) || !variables.length || !value) {
             return;
         }
+        if (typeof value !== 'string') {
+            try {
+                value = JSON.stringify(value);
+            }
+            catch (error) {
+                console.error('[amis][formula] given value is not a string');
+                value = '';
+            }
+        }
         var varMap = {};
         eachTree(variables, function (item) {
             var _a;

package/esm/components/formula/FuncList.js

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