amis-ui 2.2.0 → 2.3.1

package/lib/components/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -169,7 +169,7 @@ var UserSelect = /** @class */ (function (_super) {
         var _b = this.props, options = _b.options, value = _b.value;
         if (prevProps.options !== options) {
             if (options &&
-                options.length === 1 &&
+                options.length &&
                 options[0].leftOptions &&
                 Array.isArray(options[0].children)) {
                 var leftOptions = options[0].leftOptions;
@@ -266,10 +266,10 @@ var UserSelect = /** @class */ (function (_super) {
         this.sortable && this.sortable.destroy();
     };
     UserSelect.prototype.onOpen = function () {
-        var selection = this.state.selection;
+        var selection = this.props.selection;
         this.setState({
             isOpened: true,
-            tempSelection: selection.slice()
+            selection: selection || []
         });
     };
     UserSelect.prototype.handleBack = function () {
@@ -278,6 +278,7 @@ var UserSelect = /** @class */ (function (_super) {
             inputValue: '',
             isSearch: false,
             searchList: [],
+            selection: [],
             breadList: []
         });
     };
@@ -327,6 +328,8 @@ var UserSelect = /** @class */ (function (_super) {
         // 直接替换的option 肯定是数组
         if (isReplace) {
             selection = option;
+            // ResultBox 删除场景
+            onChange(selection);
         }
         else {
             var selectionVals = selection.map(function (option) { return option[valueField]; });
@@ -343,23 +346,35 @@ var UserSelect = /** @class */ (function (_super) {
                 }
             }
         }
-        onChange(multiple ? selection : selection === null || selection === void 0 ? void 0 : selection[0]);
+        // onChange(multiple ? selection : selection?.[0]);
         this.setState({
             selection: selection
         });
         return false;
     };
+    UserSelect.prototype.handleSubmit = function () {
+        var _a = this.props, onChange = _a.onChange, multiple = _a.multiple;
+        var selection = this.state.selection;
+        var value = multiple ? selection : selection === null || selection === void 0 ? void 0 : selection[0];
+        onChange(value);
+        this.handleBack();
+    };
     UserSelect.prototype.onDelete = function (option, isTemp) {
         if (isTemp === void 0) { isTemp = false; }
-        var _a = this.props.valueField, valueField = _a === void 0 ? 'value' : _a;
-        var _b = this.state, tempSelection = _b.tempSelection, selection = _b.selection;
+        var _a = this.props, _b = _a.valueField, valueField = _b === void 0 ? 'value' : _b, controlled = _a.controlled, onChange = _a.onChange;
+        var _c = this.state, tempSelection = _c.tempSelection, selection = _c.selection;
         var _selection = isTemp ? tempSelection : selection;
         _selection = _selection.filter(function (item) { return item[valueField] !== option[valueField]; });
         if (isTemp) {
             this.setState({ tempSelection: _selection });
         }
         else {
-            this.setState({ selection: _selection });
+            if (controlled) {
+                onChange(option, false, true);
+            }
+            else {
+                this.setState({ selection: _selection });
+            }
         }
     };
     UserSelect.prototype.handleBreadChange = function (option, index) {
@@ -368,6 +383,16 @@ var UserSelect = /** @class */ (function (_super) {
             breadList: breadList
         });
     };
+    UserSelect.prototype.handleSort = function () {
+        var _a;
+        var controlled = this.props.controlled;
+        this.setState({
+            isSelectOpened: true,
+            tempSelection: controlled
+                ? ((_a = this.props.selection) === null || _a === void 0 ? void 0 : _a.slice()) || []
+                : this.state.selection.slice()
+        });
+    };
     UserSelect.prototype.handleEdit = function () {
         var _a = this.props, multiple = _a.multiple, onChange = _a.onChange, controlled = _a.controlled;
         var _b = this.state, isEdit = _b.isEdit, tempSelection = _b.tempSelection;
@@ -394,12 +419,28 @@ var UserSelect = /** @class */ (function (_super) {
             });
         }
     };
+    UserSelect.prototype.handleClear = function () {
+        this.setState({ tempSelection: [] });
+    };
+    UserSelect.prototype.getResult = function () {
+        var _a;
+        var _b = this.props, _c = _b.valueField, valueField = _c === void 0 ? 'value' : _c, _d = _b.labelField, labelField = _d === void 0 ? 'label' : _d, _e = _b.options, options = _e === void 0 ? [] : _e;
+        var _selection = ((_a = this.props.selection) === null || _a === void 0 ? void 0 : _a.slice()) || [];
+        amisCore.eachTree(options, function (item) {
+            var res = _selection.find(function (item2) { return item2[valueField] === item[valueField]; });
+            if (res) {
+                res[labelField] = item[labelField];
+            }
+        });
+        return _selection;
+    };
     UserSelect.prototype.renderIcon = function (option, isSelect) {
-        var _a = this.props, _b = _a.labelField, labelField = _b === void 0 ? 'label' : _b, cx = _a.classnames, isRef = _a.isRef;
+        var _a;
+        var _b = this.props, _c = _b.labelField, labelField = _c === void 0 ? 'label' : _c, cx = _b.classnames, isRef = _b.isRef;
         var isSearch = this.state.isSearch;
         if (!option.icon) {
             if (option.isRef || ((isSearch || isSelect) && isRef)) {
-                return (React__default["default"].createElement("span", { className: cx('UserSelect-text-userPic') }, option[labelField].slice(0, 1)));
+                return (React__default["default"].createElement("span", { className: cx('UserSelect-text-userPic') }, (_a = option[labelField]) === null || _a === void 0 ? void 0 : _a.slice(0, 1)));
             }
             else {
                 // 没有icon默认返回部门图标
@@ -489,11 +530,9 @@ var UserSelect = /** @class */ (function (_super) {
     };
     UserSelect.prototype.renderContent = function () {
         var _this = this;
-        var _a = this.props, navTitle = _a.navTitle, showNav = _a.showNav, searchable = _a.searchable, searchPlaceholder = _a.searchPlaceholder, controlled = _a.controlled, _b = _a.labelField, labelField = _b === void 0 ? 'label' : _b, _c = _a.valueField, valueField = _c === void 0 ? 'value' : _c, cx = _a.classnames; _a.translate;
+        var _a = this.props, navTitle = _a.navTitle, showNav = _a.showNav, searchable = _a.searchable, searchPlaceholder = _a.searchPlaceholder, controlled = _a.controlled, _b = _a.labelField, labelField = _b === void 0 ? 'label' : _b, _c = _a.valueField, valueField = _c === void 0 ? 'value' : _c, cx = _a.classnames, __ = _a.translate;
         var _d = this.state, breadList = _d.breadList, options = _d.options, isSearch = _d.isSearch, searchList = _d.searchList, searchLoading = _d.searchLoading;
-        var selection = controlled
-            ? this.props.selection || []
-            : this.state.selection;
+        var selection = controlled ? this.props.selection : this.state.selection;
         return (React__default["default"].createElement("div", { className: cx("UserSelect-wrap") },
             showNav ? (React__default["default"].createElement("div", { className: cx('UserSelect-navbar') },
                 React__default["default"].createElement("span", { className: "left-arrow-box", onClick: this.handleBack },
@@ -519,12 +558,7 @@ var UserSelect = /** @class */ (function (_super) {
                         React__default["default"].createElement("span", { className: cx('UserSelect-selectList-item-closeBox'), onClick: function () { return _this.onDelete(item); } },
                             React__default["default"].createElement(icons.Icon, { icon: "close", className: "icon" }))));
                 })),
-                React__default["default"].createElement("span", { className: cx('UserSelect-selectSort-box'), onClick: function () {
-                        return _this.setState({
-                            isSelectOpened: true,
-                            tempSelection: selection.slice()
-                        });
-                    } },
+                React__default["default"].createElement("span", { className: cx('UserSelect-selectSort-box'), onClick: this.handleSort },
                     React__default["default"].createElement(icons.Icon, { icon: "menu", className: cx('UserSelect-selectSort', 'icon') })))) : null,
             isSearch ? (searchLoading ? (React__default["default"].createElement("div", { className: cx("UserSelect-searchLoadingBox") },
                 React__default["default"].createElement(Spinner["default"], null))) : (React__default["default"].createElement("div", { className: cx('UserSelect-searchResult') }, this.renderList(searchList, -1, true)))) : (React__default["default"].createElement("div", { className: cx("UserSelect-contentBox") },
@@ -539,15 +573,16 @@ var UserSelect = /** @class */ (function (_super) {
                         var hasChildren = Array.isArray(children) && children;
                         return hasChildren ? (_this.renderList(children, option[valueField])) : (React__default["default"].createElement("div", { className: cx("UserSelect-spinnerBox"), key: index },
                             React__default["default"].createElement(Spinner["default"], null)));
-                    }))))));
+                    })))),
+            !controlled ? (React__default["default"].createElement("div", { className: cx('UserSelect-footer') },
+                React__default["default"].createElement("button", { type: "button", className: cx('Button Button--md Button--primary'), onClick: this.handleSubmit }, __('UserSelect.sure')))) : null));
     };
     UserSelect.prototype.render = function () {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, __ = _a.translate, _b = _a.placeholder, placeholder = _b === void 0 ? '请选择' : _b, showResultBox = _a.showResultBox, controlled = _a.controlled; _a.onChange;
-        var _c = this.state, isOpened = _c.isOpened, tempSelection = _c.tempSelection, isSelectOpened = _c.isSelectOpened, isEdit = _c.isEdit;
-        var selection = controlled ? this.props.selection : this.state.selection;
+        var _a = this.props, cx = _a.classnames, __ = _a.translate, _b = _a.placeholder, placeholder = _b === void 0 ? '请选择' : _b, showResultBox = _a.showResultBox;
+        var _c = this.state, isOpened = _c.isOpened, isEdit = _c.isEdit, isSelectOpened = _c.isSelectOpened;
         return (React__default["default"].createElement("div", { className: cx('UserSelect') },
-            showResultBox ? (React__default["default"].createElement(ResultBox["default"], { className: cx('UserSelect-input', isOpened ? 'is-active' : ''), allowInput: false, result: selection, onResultChange: function (value) { return _this.handleSelectChange(value, true); }, onResultClick: this.onOpen, placeholder: placeholder, useMobileUI: true })) : null,
+            showResultBox ? (React__default["default"].createElement(ResultBox["default"], { className: cx('UserSelect-input', isOpened ? 'is-active' : ''), allowInput: false, result: this.getResult(), onResultChange: function (value) { return _this.handleSelectChange(value, true); }, onResultClick: this.onOpen, placeholder: placeholder, useMobileUI: true })) : null,
             showResultBox ? (React__default["default"].createElement(PopUp["default"], { isShow: isOpened, className: cx("UserSelect-popup"), onHide: this.onClose, showClose: false }, this.renderContent())) : (this.renderContent()),
             React__default["default"].createElement(PopUp["default"], { isShow: isSelectOpened, className: cx("UserSelect-selectPopup"), onHide: function () {
                     return _this.setState({
@@ -569,8 +604,8 @@ var UserSelect = /** @class */ (function (_super) {
                     React__default["default"].createElement("div", { className: cx('UserSelect-selectList-box') },
                         React__default["default"].createElement("div", { className: cx('UserSelect-select-head') },
                             React__default["default"].createElement("span", { className: cx('UserSelect-select-head-text') }, __('UserSelect.selected')),
-                            isEdit ? (React__default["default"].createElement("span", { className: cx('UserSelect-select-head-btnClear'), onClick: function () { return _this.setState({ tempSelection: [] }); } }, __('UserSelect.clear'))) : null),
-                        this.renderselectList(tempSelection))))));
+                            isEdit ? (React__default["default"].createElement("span", { className: cx('UserSelect-select-head-btnClear'), onClick: this.handleClear }, __('UserSelect.clear'))) : null),
+                        this.renderselectList(this.state.tempSelection))))));
     };
     UserSelect.defaultProps = {
         showResultBox: true,
@@ -625,6 +660,12 @@ var UserSelect = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object, Boolean]),
         tslib.__metadata("design:returntype", void 0)
     ], UserSelect.prototype, "handleSelectChange", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], UserSelect.prototype, "handleSubmit", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
@@ -637,12 +678,30 @@ var UserSelect = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object, Number]),
         tslib.__metadata("design:returntype", void 0)
     ], UserSelect.prototype, "handleBreadChange", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], UserSelect.prototype, "handleSort", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], UserSelect.prototype, "handleEdit", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], UserSelect.prototype, "handleClear", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], UserSelect.prototype, "getResult", null);
     return UserSelect;
 }(React__default["default"].Component));
 var UserSelect$1 = amisCore.themeable(amisCore.localeable(UserSelect));

package/lib/components/UserTabSelect.d.ts

@@ -37,7 +37,6 @@ export interface UserTabSelectState {
     inputValue: string;
     breadList: Array<any>;
     options: Array<Option>;
-    tempSelection: Array<Option>;
     selection: Array<Option>;
     searchList: Array<Option>;
     searchLoading: boolean;
@@ -55,9 +54,11 @@ export declare class UserTabSelect extends React.Component<UserTabSelectProps, U
     componentWillUnmount(): void;
     onClose(): void;
     onOpen(): void;
-    handleBack(): void;
-    handleSelectChange(option: Option | Array<Option>, isReplace?: boolean): boolean;
+    handleSubmit(): void;
+    handleSelectChange(option: Option | Array<Option>, isReplace?: boolean, isDelete?: boolean): boolean;
+    handleImmediateChange(option: Array<Option>): void;
     handleTabChange(key: number): void;
+    getResult(): Option[];
     render(): JSX.Element;
 }
 declare const _default: {

package/lib/components/UserTabSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -117,7 +117,6 @@ var UserTabSelect = /** @class */ (function (_super) {
             options: [],
             breadList: [],
             searchList: [],
-            tempSelection: [],
             selection: props.selection ? props.selection : [],
             isSearch: false,
             searchLoading: false,
@@ -138,32 +137,36 @@ var UserTabSelect = /** @class */ (function (_super) {
             inputValue: '',
             searchList: [],
             searchLoading: false,
-            activeKey: 0
+            activeKey: 0,
+            selection: []
         });
     };
     UserTabSelect.prototype.onOpen = function () {
-        var selection = this.state.selection;
+        var _a = this.props.selection, selection = _a === void 0 ? [] : _a;
         this.setState({
             isOpened: true,
-            tempSelection: selection.slice()
+            selection: selection.slice()
         });
     };
-    UserTabSelect.prototype.handleBack = function () {
-        this.onClose();
+    UserTabSelect.prototype.handleSubmit = function () {
         var onChange = this.props.onChange;
         onChange(this.state.selection);
+        this.onClose();
     };
-    UserTabSelect.prototype.handleSelectChange = function (option, isReplace) {
+    UserTabSelect.prototype.handleSelectChange = function (option, isReplace, isDelete) {
         var _a = this.props, multiple = _a.multiple, _b = _a.valueField, valueField = _b === void 0 ? 'value' : _b;
         var selection = this.state.selection.slice();
         var selectionVals = selection.map(function (option) { return option[valueField]; });
-        if (isReplace && Array.isArray(option)) {
+        if (isDelete) {
+            selection = selection.filter(function (item) { return item[valueField] !== option[valueField]; });
+        }
+        else if (isReplace && Array.isArray(option)) {
             selection = option.slice();
         }
         else if (!Array.isArray(option)) {
             var pos = selectionVals.indexOf(option[valueField]);
             if (pos !== -1) {
-                selection.splice(selection.indexOf(option), 1);
+                selection.splice(pos, 1);
             }
             else {
                 if (multiple) {
@@ -179,26 +182,55 @@ var UserTabSelect = /** @class */ (function (_super) {
         });
         return false;
     };
+    UserTabSelect.prototype.handleImmediateChange = function (option) {
+        var onChange = this.props.onChange;
+        if (Array.isArray(option)) {
+            this.setState({
+                selection: option
+            });
+            onChange(option);
+        }
+    };
     UserTabSelect.prototype.handleTabChange = function (key) {
         this.setState({
             activeKey: key
         });
     };
+    UserTabSelect.prototype.getResult = function () {
+        var _a = this.props, selection = _a.selection, tabOptions = _a.tabOptions, _b = _a.valueField, valueField = _b === void 0 ? 'value' : _b, _c = _a.labelField, labelField = _c === void 0 ? 'label' : _c;
+        var _selection = (selection === null || selection === void 0 ? void 0 : selection.slice()) || [];
+        if (tabOptions) {
+            for (var _i = 0, tabOptions_1 = tabOptions; _i < tabOptions_1.length; _i++) {
+                var item = tabOptions_1[_i];
+                var _loop_1 = function (item2) {
+                    var res = _selection.find(function (item) { return item[valueField] === item2[valueField]; });
+                    if (res) {
+                        res[labelField] = item2[labelField];
+                    }
+                };
+                for (var _d = 0, _e = item.options; _d < _e.length; _d++) {
+                    var item2 = _e[_d];
+                    _loop_1(item2);
+                }
+            }
+        }
+        return _selection;
+    };
     UserTabSelect.prototype.render = function () {
         var _this = this;
-        var _a = this.props, cx = _a.classnames; _a.translate; _a.onChange; var _b = _a.placeholder, placeholder = _b === void 0 ? '请选择' : _b, tabOptions = _a.tabOptions, onSearch = _a.onSearch, deferLoad = _a.deferLoad, data = _a.data;
-        var _c = this.state, activeKey = _c.activeKey, isOpened = _c.isOpened, selection = _c.selection;
+        var _a = this.props, cx = _a.classnames, __ = _a.translate, _b = _a.placeholder, placeholder = _b === void 0 ? '请选择' : _b, tabOptions = _a.tabOptions, onSearch = _a.onSearch, deferLoad = _a.deferLoad, data = _a.data;
+        var _c = this.state, activeKey = _c.activeKey, isOpened = _c.isOpened;
         return (React__default["default"].createElement("div", { className: cx('UserTabSelect') },
-            React__default["default"].createElement(ResultBox["default"], { className: cx('UserTabSelect-input', isOpened ? 'is-active' : ''), allowInput: false, result: selection, onResultChange: function (value) { return _this.handleSelectChange(value, true); }, onResultClick: this.onOpen, placeholder: placeholder, useMobileUI: true }),
+            React__default["default"].createElement(ResultBox["default"], { className: cx('UserTabSelect-input', isOpened ? 'is-active' : ''), allowInput: false, result: this.getResult(), onResultChange: this.handleImmediateChange, onResultClick: this.onOpen, placeholder: placeholder, useMobileUI: true }),
             React__default["default"].createElement(PopUp["default"], { isShow: isOpened, className: cx("UserTabSelect-popup"), onHide: this.onClose, showClose: false },
                 React__default["default"].createElement("div", { className: cx('UserTabSelect-wrap') },
                     React__default["default"].createElement("div", { className: cx('UserSelect-navbar') },
-                        React__default["default"].createElement("span", { className: "left-arrow-box", onClick: this.handleBack },
+                        React__default["default"].createElement("span", { className: "left-arrow-box", onClick: this.onClose },
                             React__default["default"].createElement(icons.Icon, { icon: "left-arrow", className: "icon" })),
                         React__default["default"].createElement("div", { className: cx('UserSelect-navbar-title') }, "\u4EBA\u5458\u9009\u62E9")),
                     React__default["default"].createElement(Tabs["default"], { mode: "tiled", className: cx('UserTabSelect-tabs'), onSelect: this.handleTabChange, activeKey: activeKey }, tabOptions === null || tabOptions === void 0 ? void 0 : tabOptions.map(function (item, index) {
                         return (React__default["default"].createElement(Tabs.Tab, tslib.__assign({}, _this.props, { eventKey: index, key: index, title: item.title, className: "TabsTransfer-tab" }),
-                            React__default["default"].createElement(UserSelect["default"], tslib.__assign({ selection: selection, showResultBox: false }, item, { options: typeof item.options === 'string' && data
+                            React__default["default"].createElement(UserSelect["default"], tslib.__assign({ selection: _this.state.selection, showResultBox: false }, item, { options: typeof item.options === 'string' && data
                                     ? amisCore.resolveVariableAndFilter(item.options, data, '| raw')
                                     : item.options, multiple: true, controlled: true, onChange: _this.handleSelectChange, onSearch: function (input, cancelExecutor) {
                                     return item.searchable && onSearch
@@ -211,7 +243,9 @@ var UserTabSelect = /** @class */ (function (_super) {
                                 }, deferLoad: function (data, isRef, param) {
                                     return deferLoad(data, isRef, tslib.__assign({ deferApi: item.deferApi }, (param || {})));
                                 } }))));
-                    }))))));
+                    })),
+                    React__default["default"].createElement("div", { className: cx('UserTabSelect-footer') },
+                        React__default["default"].createElement("button", { type: "button", className: cx('Button Button--md Button--primary'), onClick: this.handleSubmit }, __('UserSelect.sure')))))));
     };
     UserTabSelect.defaultProps = {};
     tslib.__decorate([
@@ -231,19 +265,31 @@ var UserTabSelect = /** @class */ (function (_super) {
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
-    ], UserTabSelect.prototype, "handleBack", null);
+    ], UserTabSelect.prototype, "handleSubmit", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Object, Boolean]),
+        tslib.__metadata("design:paramtypes", [Object, Boolean, Boolean]),
         tslib.__metadata("design:returntype", void 0)
     ], UserTabSelect.prototype, "handleSelectChange", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Array]),
+        tslib.__metadata("design:returntype", void 0)
+    ], UserTabSelect.prototype, "handleImmediateChange", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Number]),
         tslib.__metadata("design:returntype", void 0)
     ], UserTabSelect.prototype, "handleTabChange", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], UserTabSelect.prototype, "getResult", null);
     return UserTabSelect;
 }(React__default["default"].Component));
 var UserTabSelect$1 = amisCore.themeable(amisCore.localeable(UserTabSelect));

package/lib/components/WithRemoteConfig.js

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

package/lib/components/WithStore.js

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

package/lib/components/calendar/Calendar.js

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

package/lib/components/calendar/CalendarContainer.js

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

package/lib/components/calendar/DaysView.js

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

package/lib/components/calendar/MonthsView.js

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

package/lib/components/calendar/QuartersView.js

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

package/lib/components/calendar/TimeView.js

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

package/lib/components/calendar/YearsView.js

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

package/lib/components/condition-builder/Expression.d.ts

@@ -29,6 +29,7 @@ export interface ExpressionProps extends ThemeProps, LocaleProps {
     formula?: FormulaPickerProps;
     popOverContainer?: any;
     renderEtrValue?: any;
+    selectMode?: 'list' | 'tree';
 }
 export declare class Expression extends React.Component<ExpressionProps> {
     handleInputTypeChange(type: 'value' | 'field' | 'func' | 'formula'): void;

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -87,7 +87,7 @@ var Expression = /** @class */ (function (_super) {
         onChange(value, this.props.index);
     };
     Expression.prototype.render = function () {
-        var _a = this.props, value = _a.value, valueField = _a.valueField, allowedTypes = _a.allowedTypes, funcs = _a.funcs, fields = _a.fields, op = _a.op; _a.classnames; var fieldClassName = _a.fieldClassName, config = _a.config, data = _a.data, disabled = _a.disabled, searchable = _a.searchable, formula = _a.formula, popOverContainer = _a.popOverContainer, renderEtrValue = _a.renderEtrValue;
+        var _a = this.props, value = _a.value, valueField = _a.valueField, allowedTypes = _a.allowedTypes, funcs = _a.funcs, fields = _a.fields, op = _a.op; _a.classnames; var fieldClassName = _a.fieldClassName, config = _a.config, data = _a.data, disabled = _a.disabled, searchable = _a.searchable, formula = _a.formula, popOverContainer = _a.popOverContainer, selectMode = _a.selectMode, renderEtrValue = _a.renderEtrValue;
         var inputType = ((value === null || value === void 0 ? void 0 : value.type) === 'field'
             ? 'field'
             : (value === null || value === void 0 ? void 0 : value.type) === 'func'
@@ -105,7 +105,7 @@ var Expression = /** @class */ (function (_super) {
         }
         return (React__default["default"].createElement(React__default["default"].Fragment, null,
             inputType === 'value' ? (React__default["default"].createElement(Value["default"], { field: valueField, value: value, onChange: this.handleValueChange, op: op, data: data, disabled: disabled, formula: formula, popOverContainer: popOverContainer, renderEtrValue: renderEtrValue })) : null,
-            inputType === 'field' ? (React__default["default"].createElement(Field["default"], { value: value === null || value === void 0 ? void 0 : value.field, onChange: this.handleFieldChange, fieldClassName: fieldClassName, disabled: disabled, searchable: searchable, popOverContainer: popOverContainer, options: valueField
+            inputType === 'field' ? (React__default["default"].createElement(Field["default"], { value: value === null || value === void 0 ? void 0 : value.field, onChange: this.handleFieldChange, fieldClassName: fieldClassName, disabled: disabled, searchable: searchable, popOverContainer: popOverContainer, selectMode: selectMode, options: valueField
                     ? amisCore.filterTree(fields, function (item) {
                         return item.children ||
                             item.type === valueField.type;

package/lib/components/condition-builder/Field.d.ts

@@ -9,6 +9,7 @@ export interface ConditionFieldProps extends ThemeProps, LocaleProps {
     fieldClassName?: string;
     searchable?: boolean;
     popOverContainer?: any;
+    selectMode?: 'list' | 'tree';
 }
 export interface ConditionFieldState {
     searchText: string;
@@ -17,7 +18,7 @@ export declare class ConditionField extends React.Component<ConditionFieldProps,
     constructor(props: ConditionFieldProps);
     onSearch(text: string): void;
     filterOptions(options: any[]): any[];
-    onPopClose(e: React.MouseEvent, onClose: () => void): void;
+    onPopClose(onClose: () => void): void;
     render(): JSX.Element;
 }
 declare const _default: {

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -16,6 +16,7 @@ var ResultBox = require('../ResultBox.js');
 var amisCore = require('amis-core');
 var icons = require('../icons.js');
 var SearchBox = require('../SearchBox.js');
+var TreeSelection = require('../TreeSelection.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -65,20 +66,23 @@ var ConditionField = /** @class */ (function (_super) {
         });
     };
     // 选了值，还原options
-    ConditionField.prototype.onPopClose = function (e, onClose) {
+    ConditionField.prototype.onPopClose = function (onClose) {
         this.setState({ searchText: '' });
         onClose();
     };
     ConditionField.prototype.render = function () {
         var _this = this;
-        var _a = this.props, options = _a.options, onChange = _a.onChange, value = _a.value, cx = _a.classnames, fieldClassName = _a.fieldClassName, disabled = _a.disabled, __ = _a.translate, searchable = _a.searchable, popOverContainer = _a.popOverContainer;
+        var _a = this.props, options = _a.options, onChange = _a.onChange, value = _a.value, cx = _a.classnames, fieldClassName = _a.fieldClassName, disabled = _a.disabled, __ = _a.translate, searchable = _a.searchable, popOverContainer = _a.popOverContainer, _b = _a.selectMode, selectMode = _b === void 0 ? 'list' : _b;
         return (React__default["default"].createElement(PopOverContainer.PopOverContainer, { popOverContainer: popOverContainer || (function () { return reactDom.findDOMNode(_this); }), popOverRender: function (_a) {
                 var onClose = _a.onClose;
                 return (React__default["default"].createElement(React__default["default"].Fragment, null,
                     searchable ? (React__default["default"].createElement(SearchBox["default"], { mini: false, onSearch: _this.onSearch })) : null,
-                    React__default["default"].createElement(GroupedSelection["default"], { multiple: false, onClick: function (e) { return _this.onPopClose(e, onClose); }, options: _this.filterOptions(_this.props.options), value: [value], option2value: option2value, onChange: function (value) {
+                    selectMode === 'tree' ? (React__default["default"].createElement(TreeSelection["default"], { className: 'is-scrollable', multiple: false, options: _this.filterOptions(_this.props.options), value: value, onChange: function (value) {
+                            _this.onPopClose(onClose);
+                            onChange(value.name);
+                        } })) : (React__default["default"].createElement(GroupedSelection["default"], { multiple: false, onClick: function () { return _this.onPopClose(onClose); }, options: _this.filterOptions(_this.props.options), value: [value], option2value: option2value, onChange: function (value) {
                             return onChange(Array.isArray(value) ? value[0] : value);
-                        } })));
+                        } }))));
             } }, function (_a) {
             var onClick = _a.onClick, ref = _a.ref, isOpened = _a.isOpened;
             return (React__default["default"].createElement("div", { className: cx('CBGroup-field') },

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

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

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

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

package/lib/components/condition-builder/Group.d.ts

@@ -23,6 +23,7 @@ export interface ConditionGroupProps extends ThemeProps, LocaleProps {
     formula?: FormulaPickerProps;
     popOverContainer?: any;
     renderEtrValue?: any;
+    selectMode?: 'list' | 'tree';
 }
 export declare class ConditionGroup extends React.Component<ConditionGroupProps> {
     getValue(): ConditionGroupValue;