amis-ui 2.0.2 → 2.2.0

package/lib/components/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -231,18 +231,25 @@ var Transfer = /** @class */ (function (_super) {
         var resultColumns = searchResultColumns || columns;
         return mode === 'table' ? (React__default["default"].createElement(TableSelection["default"], { placeholder: noResultsText, className: cx('Transfer-selection'), columns: resultColumns, options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, cellRender: cellRender, itemRender: optionItemRender, multiple: multiple })) : mode === 'tree' ? (React__default["default"].createElement(Tree["default"], { onRef: this.domRef, placeholder: noResultsText, className: cx('Transfer-selection'), options: options, value: value, disabled: disabled, onChange: function (value) {
                 return _this.handleSearchTreeChange(value, options);
-            }, joinValues: false, showIcon: false, multiple: true, cascade: true, onlyChildren: !isTreeDeferLoad, itemRender: optionItemRender })) : mode === 'chained' ? (React__default["default"].createElement(ChainedSelection["default"], { placeholder: noResultsText, className: cx('Transfer-selection'), options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, itemRender: optionItemRender, multiple: multiple })) : (React__default["default"].createElement(GroupedSelection["default"], { placeholder: noResultsText, className: cx('Transfer-selection'), options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, itemRender: optionItemRender, multiple: multiple }));
+            }, joinValues: false, showIcon: false, multiple: multiple, cascade: true, onlyChildren: !isTreeDeferLoad, itemRender: optionItemRender })) : mode === 'chained' ? (React__default["default"].createElement(ChainedSelection["default"], { placeholder: noResultsText, className: cx('Transfer-selection'), options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, itemRender: optionItemRender, multiple: multiple })) : (React__default["default"].createElement(GroupedSelection["default"], { placeholder: noResultsText, className: cx('Transfer-selection'), options: options, value: value, disabled: disabled, onChange: onChange, option2value: option2value, itemRender: optionItemRender, multiple: multiple }));
     };
     Transfer.prototype.renderOptions = function (props) {
         var selectMode = props.selectMode, columns = props.columns, options = props.options, value = props.value, disabled = props.disabled, onChange = props.onChange, option2value = props.option2value, cx = props.classnames, onDeferLoad = props.onDeferLoad, leftOptions = props.leftOptions, leftMode = props.leftMode, rightMode = props.rightMode, cellRender = props.cellRender, leftDefaultValue = props.leftDefaultValue, optionItemRender = props.optionItemRender, multiple = props.multiple, noResultsText = props.noResultsText;
-        return selectMode === 'table' ? (React__default["default"].createElement(TableSelection["default"], { className: cx('Transfer-selection'), columns: columns, options: options || [], value: value, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, cellRender: cellRender, multiple: multiple })) : selectMode === 'tree' ? (React__default["default"].createElement(Tree["default"], { onRef: this.domRef, placeholder: noResultsText, className: cx('Transfer-selection'), options: options, value: value, onChange: onChange, onlyChildren: !this.state.isTreeDeferLoad, itemRender: optionItemRender, onDeferLoad: onDeferLoad, joinValues: false, showIcon: false, multiple: true, cascade: true })) : selectMode === 'chained' ? (React__default["default"].createElement(ChainedSelection["default"], { className: cx('Transfer-selection'), options: options || [], value: value, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, itemRender: optionItemRender, multiple: multiple })) : selectMode === 'associated' ? (React__default["default"].createElement(AssociatedSelection["default"], { className: cx('Transfer-selection'), options: options || [], value: value, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, columns: columns, leftOptions: leftOptions || [], leftMode: leftMode, rightMode: rightMode, leftDefaultValue: leftDefaultValue, itemRender: optionItemRender, multiple: multiple })) : (React__default["default"].createElement(GroupedSelection["default"], { className: cx('Transfer-selection'), options: options || [], value: value, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, itemRender: optionItemRender, multiple: multiple }));
+        return selectMode === 'table' ? (React__default["default"].createElement(TableSelection["default"], { className: cx('Transfer-selection'), columns: columns, options: options || [], value: value, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, cellRender: cellRender, multiple: multiple })) : selectMode === 'tree' ? (React__default["default"].createElement(Tree["default"], { onRef: this.domRef, placeholder: noResultsText, className: cx('Transfer-selection'), options: options, value: value, onChange: onChange, onlyChildren: !this.state.isTreeDeferLoad, itemRender: optionItemRender, onDeferLoad: onDeferLoad, joinValues: false, showIcon: false, multiple: multiple, cascade: true })) : selectMode === 'chained' ? (React__default["default"].createElement(ChainedSelection["default"], { className: cx('Transfer-selection'), options: options || [], value: value, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, itemRender: optionItemRender, multiple: multiple })) : selectMode === 'associated' ? (React__default["default"].createElement(AssociatedSelection["default"], { className: cx('Transfer-selection'), options: options || [], value: value, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, columns: columns, leftOptions: leftOptions || [], leftMode: leftMode, rightMode: rightMode, leftDefaultValue: leftDefaultValue, itemRender: optionItemRender, multiple: multiple })) : (React__default["default"].createElement(GroupedSelection["default"], { className: cx('Transfer-selection'), options: options || [], value: value, disabled: disabled, onChange: onChange, option2value: option2value, onDeferLoad: onDeferLoad, itemRender: optionItemRender, multiple: multiple }));
     };
     Transfer.prototype.renderResult = function () {
         var _a = this.props, columns = _a.columns, options = _a.options, disabled = _a.disabled, option2value = _a.option2value, cx = _a.classnames, cellRender = _a.cellRender, onChange = _a.onChange, value = _a.value, resultItemRender = _a.resultItemRender, resultSearchable = _a.resultSearchable, resultSearchPlaceholder = _a.resultSearchPlaceholder, onResultSearch = _a.onResultSearch, sortable = _a.sortable, __ = _a.translate;
         var _b = this.state, resultSelectMode = _b.resultSelectMode, isTreeDeferLoad = _b.isTreeDeferLoad;
         var searchable = !isTreeDeferLoad && resultSearchable;
         var placeholder = resultSearchPlaceholder || __('Transfer.selectFromLeft');
-        return resultSelectMode === 'table' ? (React__default["default"].createElement(ResultTableList["default"], { classnames: cx, columns: columns, options: options || [], value: value, disabled: disabled, option2value: option2value, cellRender: cellRender, onChange: onChange, multiple: false, searchable: searchable, placeholder: placeholder, onSearch: onResultSearch })) : resultSelectMode === 'tree' ? (React__default["default"].createElement(ResultTreeList["default"], { classnames: cx, options: options, valueField: 'value', value: value || [], onChange: onChange, itemRender: resultItemRender, searchable: searchable, placeholder: placeholder, onSearch: onResultSearch })) : (React__default["default"].createElement(ResultList["default"], { className: cx('Transfer-value'), sortable: sortable, disabled: disabled, value: value, onChange: onChange, placeholder: placeholder, itemRender: resultItemRender, searchable: searchable, onSearch: onResultSearch }));
+        switch (resultSelectMode) {
+            case 'table':
+                return (React__default["default"].createElement(ResultTableList["default"], { classnames: cx, columns: columns, options: options || [], value: value, disabled: disabled, option2value: option2value, cellRender: cellRender, onChange: onChange, multiple: false, searchable: searchable, placeholder: placeholder, onSearch: onResultSearch }));
+            case 'tree':
+                return (React__default["default"].createElement(ResultTreeList["default"], { classnames: cx, className: cx('Transfer-value'), options: options, valueField: 'value', value: value || [], onChange: onChange, itemRender: resultItemRender, searchable: searchable, placeholder: placeholder, onSearch: onResultSearch }));
+            default:
+                return (React__default["default"].createElement(ResultList["default"], { className: cx('Transfer-value'), sortable: sortable, disabled: disabled, value: value, onChange: onChange, placeholder: placeholder, itemRender: resultItemRender, searchable: searchable, onSearch: onResultSearch }));
+        }
     };
     Transfer.prototype.render = function () {
         var _a = this.props, inline = _a.inline, cx = _a.classnames, className = _a.className, value = _a.value, resultTitle = _a.resultTitle, options = _a.options, option2value = _a.option2value, disabled = _a.disabled, statistics = _a.statistics, showArrow = _a.showArrow, resultListModeFollowSelect = _a.resultListModeFollowSelect, _b = _a.selectMode, selectMode = _b === void 0 ? 'list' : _b, __ = _a.translate;

package/lib/components/TransferDropDown.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -27,7 +27,7 @@ var TransferDropDown = /** @class */ (function (_super) {
     }
     TransferDropDown.prototype.render = function () {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, value = _a.value, itemRender = _a.itemRender, __ = _a.translate, disabled = _a.disabled, clearable = _a.clearable, className = _a.className, onChange = _a.onChange, onSearch = _a.onSearch, multiple = _a.multiple, borderMode = _a.borderMode, useMobileUI = _a.useMobileUI, popOverContainer = _a.popOverContainer, maxTagCount = _a.maxTagCount, overflowTagPopover = _a.overflowTagPopover;
+        var _a = this.props, cx = _a.classnames, value = _a.value, itemRender = _a.itemRender, __ = _a.translate, disabled = _a.disabled, clearable = _a.clearable, className = _a.className, onChange = _a.onChange, onSearch = _a.onSearch, multiple = _a.multiple, borderMode = _a.borderMode, useMobileUI = _a.useMobileUI, popOverContainer = _a.popOverContainer, placeholder = _a.placeholder, maxTagCount = _a.maxTagCount, overflowTagPopover = _a.overflowTagPopover;
         var _b = this.state, inputValue = _b.inputValue, searchResult = _b.searchResult;
         var mobileUI = useMobileUI && amisCore.isMobile();
         return (React__default["default"].createElement(PopOverContainer.PopOverContainer, { useMobileUI: useMobileUI, popOverContainer: popOverContainer, popOverClassName: cx('TransferDropDown-popover'), popOverRender: function (_a) {
@@ -36,7 +36,7 @@ var TransferDropDown = /** @class */ (function (_super) {
                         'is-mobile': mobileUI
                     }) },
                     onSearch ? (React__default["default"].createElement("div", { className: cx('Transfer-search') },
-                        React__default["default"].createElement(InputBox["default"], { value: inputValue, onChange: _this.handleSearch, placeholder: __('Transfer.searchKeyword'), clearable: false, onKeyDown: _this.handleSearchKeyDown }, searchResult !== null ? (React__default["default"].createElement("a", { onClick: _this.handleSeachCancel },
+                        React__default["default"].createElement(InputBox["default"], { value: inputValue, onChange: _this.handleSearch, placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : __('Transfer.searchKeyword'), clearable: false, onKeyDown: _this.handleSearchKeyDown }, searchResult !== null ? (React__default["default"].createElement("a", { onClick: _this.handleSeachCancel },
                             React__default["default"].createElement(icons.Icon, { icon: "close", className: "icon" }))) : (React__default["default"].createElement(icons.Icon, { icon: "search", className: "icon" }))))) : null,
                     searchResult !== null
                         ? _this.renderSearchResult(tslib.__assign(tslib.__assign({}, _this.props), { value: value, onChange: multiple
@@ -53,8 +53,7 @@ var TransferDropDown = /** @class */ (function (_super) {
                                 }, multiple: multiple }))));
             } }, function (_a) {
             var onClick = _a.onClick, isOpened = _a.isOpened, ref = _a.ref;
-            return (React__default["default"].createElement(ResultBox["default"], { className: cx('TransferDropDown', className, isOpened ? 'is-active' : ''), borderMode: borderMode, allowInput: false, result: multiple ? value : (value === null || value === void 0 ? void 0 : value[0]) ? value === null || value === void 0 ? void 0 : value[0] : null, onResultChange: onChange, onResultClick: onClick, placeholder: __('Select.placeholder'), disabled: disabled, clearable: clearable, maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, ref: ref, itemRender: itemRender, useMobileUI: useMobileUI }, !mobileUI ? (React__default["default"].createElement("span", { className: cx('TransferDropDown-icon') },
-                React__default["default"].createElement(icons.Icon, { icon: "right-arrow-bold", className: "icon" }))) : (React__default["default"].createElement(React__default["default"].Fragment, null))));
+            return (React__default["default"].createElement(ResultBox["default"], { className: cx('TransferDropDown', className, isOpened ? 'is-opened' : ''), borderMode: borderMode, allowInput: false, result: multiple ? value : (value === null || value === void 0 ? void 0 : value[0]) ? value === null || value === void 0 ? void 0 : value[0] : null, onResultChange: onChange, onResultClick: onClick, placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : __('Select.placeholder'), disabled: disabled, clearable: clearable, maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, ref: ref, itemRender: itemRender, useMobileUI: useMobileUI, hasDropDownArrow: !mobileUI }));
         }));
     };
     return TransferDropDown;

package/lib/components/TransferPicker.js

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

package/lib/components/TransferSearch.js

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

package/lib/components/Tree.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -546,38 +546,39 @@ var TreeSelector = /** @class */ (function (_super) {
                         }) },
                         React__default["default"].createElement(icons.Icon, { icon: "down-arrow-bold", className: "icon" }))) : (React__default["default"].createElement("span", { className: cx('Tree-itemArrowPlaceholder') })),
                     checkbox,
-                    showIcon ? (React__default["default"].createElement("i", { className: cx("Tree-itemIcon ".concat(childrenItems ? 'Tree-folderIcon' : 'Tree-leafIcon')), onClick: function () {
-                            return !nodeDisabled &&
-                                (multiple
-                                    ? _this.handleCheck(item, !selfChecked)
-                                    : _this.handleSelect(item));
-                        } }, icons.getIcon(iconValue) ? (React__default["default"].createElement(icons.Icon, { icon: iconValue, className: "icon" })) : (React__default["default"].createElement("i", { className: iconValue })))) : null,
-                    React__default["default"].createElement("span", { className: cx('Tree-itemText'), onClick: function () {
-                            return !nodeDisabled &&
-                                (multiple
-                                    ? _this.handleCheck(item, !selfChecked)
-                                    : _this.handleSelect(item));
-                        } }, highlightTxt
-                        ? amisCore.highlight("".concat(item[labelField]), highlightTxt)
-                        : itemRender
-                            ? itemRender(item, {
-                                index: key,
-                                multiple: multiple,
-                                checked: checked,
-                                onChange: function () { return _this.handleCheck(item, !selfChecked); },
-                                disabled: disabled || item.disabled
-                            })
-                            : "".concat(item[labelField])),
-                    !nodeDisabled &&
-                        !isAdding &&
-                        !isEditing &&
-                        !(item.defer && !item.loaded) ? (React__default["default"].createElement("div", { className: cx('Tree-item-icons') },
-                        creatable && amisCore.hasAbility(item, 'creatable') ? (React__default["default"].createElement("a", { onClick: _this.handleAdd.bind(_this, item), "data-tooltip": __(createTip), "data-position": "left" },
-                            React__default["default"].createElement(icons.Icon, { icon: "plus", className: "icon" }))) : null,
-                        removable && amisCore.hasAbility(item, 'removable') ? (React__default["default"].createElement("a", { onClick: _this.handleRemove.bind(_this, item), "data-tooltip": __(removeTip), "data-position": "left" },
-                            React__default["default"].createElement(icons.Icon, { icon: "minus", className: "icon" }))) : null,
-                        editable && amisCore.hasAbility(item, 'editable') ? (React__default["default"].createElement("a", { onClick: _this.handleEdit.bind(_this, item), "data-tooltip": __(editTip), "data-position": "left" },
-                            React__default["default"].createElement(icons.Icon, { icon: "pencil", className: "icon" }))) : null)) : null)),
+                    React__default["default"].createElement("div", { className: cx('Tree-itemLabel-item') },
+                        showIcon ? (React__default["default"].createElement("i", { className: cx("Tree-itemIcon ".concat(childrenItems ? 'Tree-folderIcon' : 'Tree-leafIcon')), onClick: function () {
+                                return !nodeDisabled &&
+                                    (multiple
+                                        ? _this.handleCheck(item, !selfChecked)
+                                        : _this.handleSelect(item));
+                            } }, icons.getIcon(iconValue) ? (React__default["default"].createElement(icons.Icon, { icon: iconValue, className: "icon" })) : React__default["default"].isValidElement(iconValue) ? (iconValue) : (React__default["default"].createElement("i", { className: iconValue })))) : null,
+                        React__default["default"].createElement("span", { className: cx('Tree-itemText'), onClick: function () {
+                                return !nodeDisabled &&
+                                    (multiple
+                                        ? _this.handleCheck(item, !selfChecked)
+                                        : _this.handleSelect(item));
+                            }, title: item[labelField] }, highlightTxt
+                            ? amisCore.highlight("".concat(item[labelField]), highlightTxt)
+                            : itemRender
+                                ? itemRender(item, {
+                                    index: key,
+                                    multiple: multiple,
+                                    checked: checked,
+                                    onChange: function () { return _this.handleCheck(item, !selfChecked); },
+                                    disabled: disabled || item.disabled
+                                })
+                                : "".concat(item[labelField])),
+                        !nodeDisabled &&
+                            !isAdding &&
+                            !isEditing &&
+                            !(item.defer && !item.loaded) ? (React__default["default"].createElement("div", { className: cx('Tree-item-icons') },
+                            creatable && amisCore.hasAbility(item, 'creatable') ? (React__default["default"].createElement("a", { onClick: _this.handleAdd.bind(_this, item), "data-tooltip": __(createTip), "data-position": "left" },
+                                React__default["default"].createElement(icons.Icon, { icon: "plus", className: "icon" }))) : null,
+                            removable && amisCore.hasAbility(item, 'removable') ? (React__default["default"].createElement("a", { onClick: _this.handleRemove.bind(_this, item), "data-tooltip": __(removeTip), "data-position": "left" },
+                                React__default["default"].createElement(icons.Icon, { icon: "minus", className: "icon" }))) : null,
+                            editable && amisCore.hasAbility(item, 'editable') ? (React__default["default"].createElement("a", { onClick: _this.handleEdit.bind(_this, item), "data-tooltip": __(editTip), "data-position": "left" },
+                                React__default["default"].createElement(icons.Icon, { icon: "new-edit", className: "icon" }))) : null)) : null))),
                 (childrenItems && _this.isUnfolded(item)) ||
                     (isAdding && addingParent === item) ? (React__default["default"].createElement("ul", { className: cx('Tree-sublist') },
                     isAdding && addingParent === item ? (React__default["default"].createElement("li", { className: cx('Tree-item') }, _this.renderInput(checkbox

package/lib/components/TreeSelection.js

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

package/lib/components/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -165,7 +165,8 @@ var UserSelect = /** @class */ (function (_super) {
     }
     UserSelect.prototype.componentDidMount = function () { };
     UserSelect.prototype.componentDidUpdate = function (prevProps) {
-        var _a = this.props, options = _a.options, value = _a.value;
+        var _a;
+        var _b = this.props, options = _b.options, value = _b.value;
         if (prevProps.options !== options) {
             if (options &&
                 options.length === 1 &&
@@ -184,7 +185,8 @@ var UserSelect = /** @class */ (function (_super) {
             }
         }
         if (JSON.stringify(value) !== JSON.stringify(prevProps.value) ||
-            JSON.stringify(options) !== JSON.stringify(prevProps.options)) {
+            (JSON.stringify(options) !== JSON.stringify(prevProps.options) &&
+                ((_a = prevProps.options) === null || _a === void 0 ? void 0 : _a.length))) {
             var selection = Select.value2array(value, this.props);
             this.setState({
                 selection: selection

package/lib/components/UserTabSelect.js

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

package/lib/components/WithRemoteConfig.js

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

package/lib/components/WithStore.js

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

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

@@ -47,6 +47,7 @@ interface BaseDatePickerProps {
         color?: string;
     }>;
     largeMode?: boolean;
+    todayActiveStyle?: React.CSSProperties;
     onScheduleClick?: (scheduleData: any) => void;
     hideHeader?: boolean;
     updateOn?: string;

package/lib/components/calendar/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -439,6 +439,7 @@ var BaseDatePicker = /** @class */ (function (_super) {
             'maxDate',
             'schedules',
             'largeMode',
+            'todayActiveStyle',
             'onScheduleClick',
             'hideHeader',
             'updateOn',
@@ -489,7 +490,11 @@ var BaseDatePicker = /** @class */ (function (_super) {
                         ? 'rdtPickerTime'
                         : dateFormat && !timeFormat
                             ? 'rdtPickerDate'
-                            : '') },
+                            : '', viewMode === 'months' ||
+                    viewMode === 'years' ||
+                    viewMode === 'quarters'
+                    ? 'rdtPickerNotDays'
+                    : '') },
                 React__default["default"].createElement(Component, { view: this.state.currentView, viewProps: viewProps, timeRangeHeader: timeRangeHeader }))));
     };
     return BaseDatePicker;

package/lib/components/calendar/CalendarContainer.js

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

package/lib/components/calendar/DaysView.d.ts

@@ -40,6 +40,7 @@ interface CustomDaysViewProps extends LocaleProps {
         className?: string;
     }>;
     largeMode?: boolean;
+    todayActiveStyle?: React.CSSProperties;
     onScheduleClick?: (scheduleData: any) => void;
     hideHeader?: boolean;
     getColumns: (types: DateType[], dateBoundary: void) => any;
@@ -81,7 +82,6 @@ export declare class CustomDaysView extends React.Component<CustomDaysViewProps>
     alwaysValidDate(): number;
     renderDays(): React.DetailedReactHTMLElement<React.HTMLAttributes<HTMLElement>, HTMLElement>[];
     constructor(props: any);
-    componentWillMount(): void;
     componentDidMount(): void;
     updateSelectedDate: (event: React.MouseEvent<any>) => void;
     showTime: () => JSX.Element;

package/lib/components/calendar/DaysView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -12,9 +12,14 @@ var moment = require('moment');
 var React = require('react');
 var Downshift = require('downshift');
 var findIndex = require('lodash/findIndex');
+var extend = require('lodash/extend');
 var merge = require('lodash/merge');
+var omit = require('lodash/omit');
+var each = require('lodash/each');
+var kebabCase = require('lodash/kebabCase');
 var amisCore = require('amis-core');
 var Picker = require('../Picker.js');
+var icons = require('../icons.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -22,7 +27,11 @@ var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var Downshift__default = /*#__PURE__*/_interopDefaultLegacy(Downshift);
 var findIndex__default = /*#__PURE__*/_interopDefaultLegacy(findIndex);
+var extend__default = /*#__PURE__*/_interopDefaultLegacy(extend);
 var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
+var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
+var each__default = /*#__PURE__*/_interopDefaultLegacy(each);
+var kebabCase__default = /*#__PURE__*/_interopDefaultLegacy(kebabCase);
 
 // 最早基于 react-datetime 2.16.2 版本，后来大部分都自己写了
 var CustomDaysView = /** @class */ (function (_super) {
@@ -122,17 +131,35 @@ var CustomDaysView = /** @class */ (function (_super) {
             _this.props.onClose && _this.props.onClose();
         };
         _this.renderDay = function (props, currentDate) {
+            var todayActiveStyle = props.todayActiveStyle; /** 只有today才会传入这个属性 */
+            var _a = _this.props, cx = _a.classnames, __ = _a.translate;
+            var injectedProps = omit__default["default"](props, ['todayActiveStyle']);
+            /** 某些情况下需要用inline style覆盖动态class，需要hack important的样式 */
+            var todayDomRef = function (node) {
+                if (todayActiveStyle && node) {
+                    each__default["default"](todayActiveStyle, function (value, key) {
+                        var _a, _b;
+                        if (typeof value === 'string' && !!~value.indexOf('!important')) {
+                            (_b = (_a = node === null || node === void 0 ? void 0 : node.style) === null || _a === void 0 ? void 0 : _a.setProperty) === null || _b === void 0 ? void 0 : _b.call(_a, kebabCase__default["default"](key), String(value)
+                                .replace(/\!important/, '')
+                                .trim(), 'important');
+                        }
+                    });
+                }
+            };
             if (_this.props.schedules) {
                 var schedule_1 = [];
                 _this.props.schedules.forEach(function (item) {
-                    if (currentDate.isSameOrAfter(moment__default["default"](item.startTime).subtract(1, 'days')) &&
-                        currentDate.isSameOrBefore(item.endTime)) {
+                    /** 时间全部统一到当天的00:00:00再做比较 */
+                    var currentDateBegin = currentDate.startOf('day');
+                    var startTime = moment__default["default"](item.startTime).startOf('day');
+                    var endTime = moment__default["default"](item.endTime).startOf('day');
+                    if (currentDateBegin.isSameOrAfter(startTime) &&
+                        currentDateBegin.isSameOrBefore(endTime)) {
                         schedule_1.push(item);
                     }
                 });
                 if (schedule_1.length > 0) {
-                    var cx_1 = _this.props.classnames;
-                    var __ = _this.props.translate;
                     // 日程数据
                     var scheduleData_1 = {
                         scheduleData: schedule_1.map(function (item) {
@@ -186,44 +213,52 @@ var CustomDaysView = /** @class */ (function (_super) {
                         // 最多展示3个
                         showSchedule_1 = showSchedule_1.slice(0, 3);
                         var scheduleDiv = showSchedule_1.map(function (item, index) {
+                            var diffDays = moment__default["default"](item.endTime).diff(moment__default["default"](item.startTime), 'days');
+                            /* 存在天数跨度小于1，但是横跨2天的case */
+                            if (diffDays <= 0) {
+                                diffDays = moment__default["default"](item.endTime)
+                                    .endOf('day')
+                                    .diff(moment__default["default"](item.startTime).startOf('day'), 'days');
+                            }
+                            /* 前面的计算结果是闭区间，所以最终结果要补足1 */
+                            diffDays += 1;
                             var width = item.width ||
-                                Math.min(moment__default["default"](item.endTime).diff(moment__default["default"](item.startTime), 'days') + 1, 7 - moment__default["default"](item.startTime).weekday());
-                            return (React__default["default"].createElement("div", { key: props.key + 'content' + index, className: cx_1('ScheduleCalendar-large-schedule-content', item.className), style: { width: width + '00%' }, onClick: function () {
+                                Math.min(diffDays, 7 - moment__default["default"](item.startTime).weekday());
+                            return (React__default["default"].createElement("div", { key: injectedProps.key + 'content' + index, className: cx('ScheduleCalendar-large-schedule-content', item.className), style: { width: width + '00%' }, onClick: function () {
                                     return _this.props.onScheduleClick &&
                                         _this.props.onScheduleClick(scheduleData_1);
                                 } },
-                                React__default["default"].createElement("div", { className: cx_1('ScheduleCalendar-text-overflow') }, item.content)));
+                                React__default["default"].createElement("div", { className: cx('ScheduleCalendar-text-overflow') }, item.content)));
                         });
-                        return (React__default["default"].createElement("td", tslib.__assign({}, props),
-                            React__default["default"].createElement("div", { className: cx_1('ScheduleCalendar-large-day-wrap') },
-                                React__default["default"].createElement("div", { className: cx_1('ScheduleCalendar-large-schedule-header') },
+                        return (React__default["default"].createElement("td", tslib.__assign({}, injectedProps),
+                            React__default["default"].createElement("div", { className: cx('ScheduleCalendar-large-day-wrap') },
+                                React__default["default"].createElement("div", { className: cx('ScheduleCalendar-large-schedule-header') },
                                     React__default["default"].createElement("span", null, currentDate.date())),
                                 scheduleDiv,
-                                schedule_1.length > 3 && (React__default["default"].createElement("div", { className: cx_1('ScheduleCalendar-large-schedule-footer') },
+                                schedule_1.length > 3 && (React__default["default"].createElement("div", { className: cx('ScheduleCalendar-large-schedule-footer') },
                                     schedule_1.length - 3,
                                     " ",
                                     __('more'))))));
                     }
                     // 正常模式
-                    var ScheduleIcon = (React__default["default"].createElement("span", { className: cx_1('ScheduleCalendar-icon', schedule_1[0].className), onClick: function () {
+                    var ScheduleIcon = (React__default["default"].createElement("span", { className: cx('ScheduleCalendar-icon', schedule_1[0].className), onClick: function () {
                             return _this.props.onScheduleClick &&
                                 _this.props.onScheduleClick(scheduleData_1);
                         } }));
-                    return (React__default["default"].createElement("td", tslib.__assign({}, props),
-                        React__default["default"].createElement("span", null,
+                    return (React__default["default"].createElement("td", tslib.__assign({}, injectedProps),
+                        React__default["default"].createElement("span", { style: todayActiveStyle, ref: todayDomRef },
                             currentDate.date(),
                             ScheduleIcon)));
                 }
             }
-            return (React__default["default"].createElement("td", tslib.__assign({}, props),
-                React__default["default"].createElement("span", null, currentDate.date())));
+            return (React__default["default"].createElement("td", tslib.__assign({}, injectedProps),
+                React__default["default"].createElement("span", { style: todayActiveStyle, ref: todayDomRef }, currentDate.date())));
         };
         _this.renderTimes = function () {
             var _a = _this.props, timeFormat = _a.timeFormat, selectedDate = _a.selectedDate, viewDate = _a.viewDate, isEndDate = _a.isEndDate, cx = _a.classnames;
             var date = selectedDate || (isEndDate ? viewDate.endOf('day') : viewDate);
             var inputs = [];
             var timeConstraints = _this.timeConstraints;
-            inputs.push(_this.showTime());
             timeFormat.split(':').forEach(function (format, i) {
                 var type = /h/i.test(format)
                     ? 'hours'
@@ -269,7 +304,9 @@ var CustomDaysView = /** @class */ (function (_super) {
                 }
             });
             inputs.length && inputs.pop();
-            return React__default["default"].createElement("div", null, inputs);
+            return (React__default["default"].createElement("div", { className: cx('CalendarTimesWrapper') },
+                _this.showTime(),
+                React__default["default"].createElement("div", { className: cx('CalendarInputsWrapper') }, inputs)));
         };
         _this.renderFooter = function () {
             if (!_this.props.requiredConfirm) {
@@ -323,7 +360,7 @@ var CustomDaysView = /** @class */ (function (_super) {
             columns: columns,
             types: types,
             pickerValue: currentDate.toArray(),
-            uniqueTag: 0
+            uniqueTag: new Date().valueOf()
         };
         if (_this.props.timeConstraints) {
             _this.timeConstraints = merge__default["default"](_this.timeConstraints, props.timeConstraints);
@@ -342,6 +379,7 @@ var CustomDaysView = /** @class */ (function (_super) {
     };
     CustomDaysView.prototype.renderDays = function () {
         var date = this.props.viewDate, selected = this.props.selectedDate && this.props.selectedDate.clone(), prevMonth = date.clone().subtract(1, 'months'), currentYear = date.year(), currentMonth = date.month(), weeks = [], days = [], renderer = this.props.renderDay || this.renderDay, isValid = this.props.isValidDate || this.alwaysValidDate, classes, isDisabled, dayProps, currentDate;
+        var _a = this.props.todayActiveStyle, todayActiveStyle = _a === void 0 ? {} : _a;
         // Go to the last week of the previous month
         prevMonth.date(prevMonth.daysInMonth()).startOf('week');
         var lastDay = prevMonth.clone().add(42, 'd');
@@ -363,11 +401,11 @@ var CustomDaysView = /** @class */ (function (_super) {
             isDisabled = !isValid(currentDate, selected);
             if (isDisabled)
                 classes += ' rdtDisabled';
-            dayProps = {
+            dayProps = extend__default["default"]({
                 'key': prevMonth.format('M_D'),
                 'data-value': prevMonth.date(),
                 'className': classes
-            };
+            }, classes.includes('rdtToday') ? { todayActiveStyle: todayActiveStyle } : {});
             if (!isDisabled)
                 dayProps.onClick = this.updateSelectedDate;
             days.push(renderer(dayProps, currentDate, selected));
@@ -379,9 +417,6 @@ var CustomDaysView = /** @class */ (function (_super) {
         }
         return weeks;
     };
-    CustomDaysView.prototype.componentWillMount = function () {
-        this.setState({ uniqueTag: new Date().valueOf() });
-    };
     CustomDaysView.prototype.componentDidMount = function () {
         var _this = this;
         var _a = this.props, timeFormat = _a.timeFormat, selectedDate = _a.selectedDate, viewDate = _a.viewDate, isEndDate = _a.isEndDate;
@@ -427,13 +462,18 @@ var CustomDaysView = /** @class */ (function (_super) {
                 React__default["default"].createElement("tr", null,
                     React__default["default"].createElement("th", { colSpan: 7 },
                         React__default["default"].createElement("div", { className: "rdtHeader" },
-                            React__default["default"].createElement("a", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'years') }, "\u00AB"),
-                            React__default["default"].createElement("a", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'months') }, "\u2039"),
+                            React__default["default"].createElement("a", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'years') },
+                                React__default["default"].createElement(icons.Icon, { icon: "right-double-arrow", className: "icon date-icon-arrow-left" })),
+                            React__default["default"].createElement("a", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'months') },
+                                React__default["default"].createElement(icons.Icon, { icon: "right-arrow", className: "icon date-icon-arrow-left" })),
                             React__default["default"].createElement("div", { className: "rdtCenter" },
                                 React__default["default"].createElement("a", { className: "rdtSwitch", onClick: this.props.showView('years') }, date.format(__('dateformat.year'))),
                                 React__default["default"].createElement("a", { className: "rdtSwitch", onClick: this.props.showView('months') }, date.format(__('MMM')))),
-                            React__default["default"].createElement("a", { className: "rdtNext", onClick: this.props.addTime(1, 'months') }, "\u203A"),
-                            React__default["default"].createElement("a", { className: "rdtNext", onClick: this.props.addTime(1, 'years') }, "\u00BB")))),
+                            React__default["default"].createElement("a", { className: "rdtNext", onClick: this.props.addTime(1, 'months') },
+                                React__default["default"].createElement(icons.Icon, { icon: "right-arrow", className: "icon date-icon-arrow" })),
+                            React__default["default"].createElement("a", { className: "rdtNext", onClick: this.props.addTime(1, 'years') },
+                                React__default["default"].createElement(icons.Icon, { icon: "right-double-arrow", className: "icon date-icon-arrow" }))),
+                        React__default["default"].createElement("div", { className: "header-line" }))),
                 React__default["default"].createElement("tr", null, this.getDaysOfWeek(locale).map(function (day, index) { return (React__default["default"].createElement("th", { key: day + index, className: "dow" }, day)); })))),
             React__default["default"].createElement("tbody", { key: "tb" }, this.renderDays())
         ];

package/lib/components/calendar/MonthsView.js

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

package/lib/components/calendar/QuartersView.js

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

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

@@ -69,7 +69,6 @@ export declare class CustomTimeView extends React.Component<CustomTimeViewProps
     timer?: any;
     increaseTimer?: any;
     constructor(props: any);
-    componentWillMount(): void;
     componentDidMount(): void;
     updateSelectedDate: (event: React.MouseEvent<any>) => void;
     componentDidUpdate(preProps: CustomTimeViewProps): void;

package/lib/components/calendar/TimeView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.2.0
  * Copyright 2018-2022 fex
  */
 
@@ -242,15 +242,12 @@ var CustomTimeView = /** @class */ (function (_super) {
         _this.cancel = function () {
             _this.props.onClose && _this.props.onClose();
         };
-        _this.state = tslib.__assign(tslib.__assign({}, _this.calculateState(_this.props)), { uniqueTag: 0 });
+        _this.state = tslib.__assign(tslib.__assign({}, _this.calculateState(_this.props)), { uniqueTag: new Date().valueOf() });
         if (_this.props.timeConstraints) {
             _this.timeConstraints = merge__default["default"](_this.timeConstraints, _this.props.timeConstraints);
         }
         return _this;
     }
-    CustomTimeView.prototype.componentWillMount = function () {
-        this.setState({ uniqueTag: new Date().valueOf() });
-    };
     CustomTimeView.prototype.componentDidMount = function () {
         var _this = this;
         var _a = this.props, timeFormat = _a.timeFormat, selectedDate = _a.selectedDate, viewDate = _a.viewDate, isEndDate = _a.isEndDate;
@@ -455,7 +452,9 @@ var CustomTimeView = /** @class */ (function (_super) {
             }
         });
         inputs.length && inputs.pop();
-        var quickLists = [React__default["default"].createElement("a", { onClick: this.selectNowTime }, __('TimeNow'))];
+        var quickLists = [
+            React__default["default"].createElement("a", { key: "select-now", onClick: this.selectNowTime }, __('TimeNow'))
+        ];
         return (React__default["default"].createElement(React__default["default"].Fragment, null,
             React__default["default"].createElement("div", { className: cx(timeRangeHeader ? 'TimeRangeHeaderWrapper' : null) }, timeRangeHeader),
             React__default["default"].createElement("div", { className: cx('TimeContentWrapper') }, inputs),

package/lib/components/calendar/YearsView.js

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

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

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

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

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