amis 2.3.1 → 2.4.0

package/lib/renderers/Form/TabsTransfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -13,6 +13,7 @@ var React = require('react');
 var find = require('lodash/find');
 var amisUi = require('amis-ui');
 var Transfer = require('./Transfer.js');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -159,10 +160,11 @@ var BaseTabsTransferRenderer = /** @class */ (function (_super) {
                         }
                         (newOptions.length > options.length || optionModified) &&
                             setOptions(newOptions, true);
-                        return [4 /*yield*/, dispatchEvent('change', {
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, {
                                 value: newValue,
-                                options: options
-                            })];
+                                options: options,
+                                items: options // 为了保持名字统一
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -239,6 +241,12 @@ var BaseTabsTransferRenderer = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object, Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TabsTransferRenderer.prototype, "optionItemRender", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TabsTransferRenderer.prototype, "render", null);
     TabsTransferRenderer = tslib.__decorate([
         amisCore.OptionsControl({
             type: 'tabs-transfer'

package/lib/renderers/Form/TabsTransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -10,6 +10,7 @@ var amisCore = require('amis-core');
 var React = require('react');
 var amisUi = require('amis-ui');
 var TabsTransfer = require('./TabsTransfer.js');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -25,8 +26,8 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
         return _this;
     }
     TabsTransferPickerRenderer.prototype.dispatchEvent = function (name) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-        dispatchEvent(name, data);
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+        dispatchEvent(name, amisCore.resolveEventData(this.props, { value: value }, 'value'));
     };
     TabsTransferPickerRenderer.prototype.optionItemRender = function (option, states) {
         var _a = this.props, menuTpl = _a.menuTpl, render = _a.render, data = _a.data;
@@ -69,6 +70,12 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
         tslib.__metadata("design:paramtypes", [Object, Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TabsTransferPickerRenderer.prototype, "optionItemRender", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TabsTransferPickerRenderer.prototype, "render", null);
     TabsTransferPickerRenderer = tslib.__decorate([
         amisCore.OptionsControl({
             type: 'tabs-transfer-picker'

package/lib/renderers/Form/Textarea.d.ts

@@ -63,6 +63,7 @@ export default class TextAreaControl extends React.Component<TextAreaProps, Text
     handleChange(e: React.ChangeEvent<HTMLTextAreaElement>): void;
     handleFocus(e: React.FocusEvent<HTMLTextAreaElement>): void;
     handleBlur(e: React.FocusEvent<HTMLTextAreaElement>): void;
+    renderStatic(displayValue?: string): JSX.Element;
     render(): JSX.Element;
 }
 export declare class TextAreaControlRenderer extends TextAreaControl {

package/lib/renderers/Form/Textarea.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -39,27 +40,64 @@ var TextAreaControl = /** @class */ (function (_super) {
         (_a = this.inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     };
     TextAreaControl.prototype.handleChange = function (e) {
-        var onChange = this.props.onChange;
+        var _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+        dispatchEvent('change', amisCore.resolveEventData(this.props, { value: e }, 'value'));
         onChange && onChange(e);
     };
     TextAreaControl.prototype.handleFocus = function (e) {
-        var onFocus = this.props.onFocus;
+        var _this = this;
+        var _a = this.props, onFocus = _a.onFocus, dispatchEvent = _a.dispatchEvent, value = _a.value;
         this.setState({
             focused: true
-        }, function () {
-            onFocus && onFocus(e);
-        });
+        }, function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+            var rendererEvent;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, dispatchEvent('focus', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
+                    case 1:
+                        rendererEvent = _a.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onFocus && onFocus(e);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     };
     TextAreaControl.prototype.handleBlur = function (e) {
-        var _a = this.props, onBlur = _a.onBlur, trimContents = _a.trimContents, value = _a.value, onChange = _a.onChange;
+        var _this = this;
+        var _a = this.props, onBlur = _a.onBlur, trimContents = _a.trimContents, value = _a.value, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
         this.setState({
             focused: false
-        }, function () {
-            if (trimContents && value && typeof value === 'string') {
-                onChange(value.trim());
-            }
-            onBlur && onBlur(e);
-        });
+        }, function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+            var rendererEvent;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (trimContents && value && typeof value === 'string') {
+                            onChange(value.trim());
+                        }
+                        return [4 /*yield*/, dispatchEvent('blur', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
+                    case 1:
+                        rendererEvent = _a.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onBlur && onBlur(e);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    };
+    TextAreaControl.prototype.renderStatic = function (displayValue) {
+        if (displayValue === void 0) { displayValue = '-'; }
+        var _a = this.props, render = _a.render, _b = _a.staticSchema, staticSchema = _b === void 0 ? {} : _b;
+        return render('static-textarea', {
+            type: 'multiline-text',
+            text: displayValue,
+            maxRows: staticSchema.limit || 5
+        }, staticSchema);
     };
     TextAreaControl.prototype.render = function () {
         var rest = tslib.__rest(this.props, []);
@@ -74,25 +112,28 @@ var TextAreaControl = /** @class */ (function (_super) {
     };
     tslib.__decorate([
         amisCore.autobind,
-        amisCore.bindRendererEvent('change', undefined, false),
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TextAreaControl.prototype, "handleChange", null);
     tslib.__decorate([
         amisCore.autobind,
-        amisCore.bindRendererEvent('focus'),
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TextAreaControl.prototype, "handleFocus", null);
     tslib.__decorate([
         amisCore.autobind,
-        amisCore.bindRendererEvent('blur'),
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TextAreaControl.prototype, "handleBlur", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TextAreaControl.prototype, "render", null);
     return TextAreaControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -12,6 +12,7 @@ var React = require('react');
 var find = require('lodash/find');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -70,10 +71,11 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
                         }
                         (newOptions.length > options.length || optionModified) &&
                             setOptions(newOptions, true);
-                        return [4 /*yield*/, dispatchEvent('change', {
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, {
                                 value: newValue,
-                                options: options
-                            })];
+                                options: options,
+                                items: options // 为了保持名字统一
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -146,9 +148,11 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
         });
     };
     BaseTransferRenderer.prototype.handleResultSearch = function (term, item) {
-        var valueField = this.props.valueField;
+        var _a = this.props, valueField = _a.valueField, labelField = _a.labelField;
         var regexp = amisCore.string2regExp(term);
-        return regexp.test(item[valueField || 'value']);
+        var labelTest = item[labelField || 'label'];
+        var valueTest = item[valueField || 'value'];
+        return regexp.test(labelTest) || regexp.test(valueTest);
     };
     BaseTransferRenderer.prototype.optionItemRender = function (option, states) {
         var _a = this.props, menuTpl = _a.menuTpl, render = _a.render, data = _a.data;
@@ -184,7 +188,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
     };
     BaseTransferRenderer.prototype.onSelectAll = function (options) {
         var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-        dispatchEvent('selectAll', amisCore.createObject(data, { options: options }));
+        dispatchEvent('selectAll', amisCore.createObject(data, { items: options }));
     };
     // 动作
     BaseTransferRenderer.prototype.doAction = function (action, data, throwErrors) {
@@ -276,6 +280,12 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Array]),
         tslib.__metadata("design:returntype", void 0)
     ], BaseTransferRenderer.prototype, "onSelectAll", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], BaseTransferRenderer.prototype, "render", null);
     return BaseTransferRenderer;
 }(React__default["default"].Component));
 // ts 3.9 里面非得这样才不报错，鬼知道为何。

package/lib/renderers/Form/TransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -10,6 +10,7 @@ var amisCore = require('amis-core');
 var React = require('react');
 var amisUi = require('amis-ui');
 var Transfer = require('./Transfer.js');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -21,8 +22,8 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
         return _super !== null && _super.apply(this, arguments) || this;
     }
     TransferPickerRenderer.prototype.dispatchEvent = function (name) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, value = _a.value;
-        dispatchEvent(name, amisCore.createObject(data, { value: value }));
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+        dispatchEvent(name, amisCore.resolveEventData(this.props, { value: value }, 'value'));
     };
     // 动作
     TransferPickerRenderer.prototype.doAction = function (action) {
@@ -63,6 +64,12 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
         tslib.__metadata("design:paramtypes", [String]),
         tslib.__metadata("design:returntype", void 0)
     ], TransferPickerRenderer.prototype, "dispatchEvent", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TransferPickerRenderer.prototype, "render", null);
     TransferPickerRenderer = tslib.__decorate([
         amisCore.OptionsControl({
             type: 'transfer-picker'

package/lib/renderers/Form/TreeSelect.d.ts

@@ -76,6 +76,7 @@ export interface TreeSelectState {
 }
 export default class TreeSelectControl extends React.Component<TreeSelectProps, TreeSelectState> {
     static defaultProps: {
+        hideRoot: boolean;
         placeholder: string;
         optionsPlaceholder: string;
         multiple: boolean;

package/lib/renderers/Form/TreeSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -15,6 +15,7 @@ var matchSorter = require('match-sorter');
 var debouce = require('lodash/debounce');
 var find = require('lodash/find');
 var ReactDOM = require('react-dom');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -73,16 +74,12 @@ var TreeSelectControl = /** @class */ (function (_super) {
         }, function () { return _this.loadRemote(_this.state.inputValue); });
     };
     TreeSelectControl.prototype.handleFocus = function (e) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, data = _a.data;
-        dispatchEvent('focus', amisCore.createObject(data, {
-            value: value
-        }));
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+        dispatchEvent('focus', amisCore.resolveEventData(this.props, { value: value }, 'value'));
     };
     TreeSelectControl.prototype.handleBlur = function (e) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, data = _a.data;
-        dispatchEvent('blur', amisCore.createObject(data, {
-            value: value
-        }));
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value; _a.data;
+        dispatchEvent('blur', amisCore.resolveEventData(this.props, { value: value }, 'value'));
     };
     TreeSelectControl.prototype.handleKeyPress = function (e) {
         if (e.key === ' ') {
@@ -258,14 +255,12 @@ var TreeSelectControl = /** @class */ (function (_super) {
     };
     TreeSelectControl.prototype.resultChangeEvent = function (value) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, dispatchEvent, data, rendererEvent;
+            var _a, onChange, dispatchEvent, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent, data = _a.data;
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
-                                value: value
-                            }))];
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent, _a.data;
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -292,11 +287,11 @@ var TreeSelectControl = /** @class */ (function (_super) {
         this.treeRef = ref;
     };
     TreeSelectControl.prototype.renderOuter = function () {
-        var _a = this.props, value = _a.value, enableNodePath = _a.enableNodePath, _b = _a.pathSeparator, pathSeparator = _b === void 0 ? '/' : _b, disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter; _a.placeholder; var options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, rootLabel = _a.rootLabel, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio; _a.popOverContainer; var onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, ns = _a.classPrefix, optionsPlaceholder = _a.optionsPlaceholder, searchable = _a.searchable, autoComplete = _a.autoComplete, maxLength = _a.maxLength, minLength = _a.minLength, labelField = _a.labelField, nodePath = _a.nodePath, onAdd = _a.onAdd, creatable = _a.creatable, createTip = _a.createTip, addControls = _a.addControls, onEdit = _a.onEdit, editable = _a.editable, editTip = _a.editTip, editControls = _a.editControls, removable = _a.removable, removeTip = _a.removeTip, onDelete = _a.onDelete, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, __ = _a.translate, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, selfDisabledAffectChildren = _a.selfDisabledAffectChildren, showOutline = _a.showOutline, autoCheckChildren = _a.autoCheckChildren;
+        var _a = this.props, value = _a.value, enableNodePath = _a.enableNodePath, _b = _a.pathSeparator, pathSeparator = _b === void 0 ? '/' : _b, disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter; _a.placeholder; var options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, rootLabel = _a.rootLabel, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio; _a.popOverContainer; var onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, ns = _a.classPrefix, optionsPlaceholder = _a.optionsPlaceholder, searchable = _a.searchable, autoComplete = _a.autoComplete, maxLength = _a.maxLength, minLength = _a.minLength, labelField = _a.labelField, nodePath = _a.nodePath, onAdd = _a.onAdd, creatable = _a.creatable, createTip = _a.createTip, addControls = _a.addControls, onEdit = _a.onEdit, editable = _a.editable, editTip = _a.editTip, editControls = _a.editControls, removable = _a.removable, removeTip = _a.removeTip, onDelete = _a.onDelete, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, __ = _a.translate, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, selfDisabledAffectChildren = _a.selfDisabledAffectChildren, showOutline = _a.showOutline, autoCheckChildren = _a.autoCheckChildren, hideRoot = _a.hideRoot;
         var filtedOptions = !amisCore.isEffectiveApi(autoComplete) && searchable && this.state.inputValue
             ? this.filterOptions(options, this.state.inputValue)
             : options;
-        return (React__default["default"].createElement(amisUi.Tree, { classPrefix: ns, onRef: this.domRef, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, labelField: labelField, valueField: valueField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(optionsPlaceholder), options: filtedOptions, highlightTxt: this.state.inputValue, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, autoCheckChildren: autoCheckChildren, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, cascade: cascade, foldedField: "collapsed", hideRoot: true, value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, maxLength: maxLength, minLength: minLength, onAdd: onAdd, creatable: creatable, createTip: createTip, rootCreatable: rootCreatable, rootCreateTip: rootCreateTip, onEdit: onEdit, editable: editable, editTip: editTip, removable: removable, removeTip: removeTip, onDelete: onDelete, bultinCUD: !addControls && !editControls, onDeferLoad: deferLoad, onExpandTree: expandTreeOptions, selfDisabledAffectChildren: selfDisabledAffectChildren }));
+        return (React__default["default"].createElement(amisUi.Tree, { classPrefix: ns, onRef: this.domRef, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, labelField: labelField, valueField: valueField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(optionsPlaceholder), options: filtedOptions, highlightTxt: this.state.inputValue, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, autoCheckChildren: autoCheckChildren, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, cascade: cascade, foldedField: "collapsed", hideRoot: hideRoot, value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, maxLength: maxLength, minLength: minLength, onAdd: onAdd, creatable: creatable, createTip: createTip, rootCreatable: rootCreatable, rootCreateTip: rootCreateTip, onEdit: onEdit, editable: editable, editTip: editTip, removable: removable, removeTip: removeTip, onDelete: onDelete, bultinCUD: !addControls && !editControls, onDeferLoad: deferLoad, onExpandTree: expandTreeOptions, selfDisabledAffectChildren: selfDisabledAffectChildren }));
     };
     TreeSelectControl.prototype.render = function () {
         var _this = this;
@@ -323,6 +318,7 @@ var TreeSelectControl = /** @class */ (function (_super) {
             mobileUI ? (React__default["default"].createElement(amisUi.PopUp, { container: env && env.getModalContainer ? env.getModalContainer : undefined, className: cx("".concat(ns, "TreeSelect-popup")), isShow: isOpened, onHide: this.close }, this.renderOuter())) : null));
     };
     TreeSelectControl.defaultProps = {
+        hideRoot: true,
         placeholder: 'Select.placeholder',
         optionsPlaceholder: 'placeholder.noData',
         multiple: false,
@@ -369,6 +365,12 @@ var TreeSelectControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TreeSelectControl.prototype, "domRef", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TreeSelectControl.prototype, "render", null);
     return TreeSelectControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/UUID.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -101,11 +101,11 @@ var UserSelectControl = /** @class */ (function (_super) {
     };
     UserSelectControl.prototype.changeValue = function (value) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, joinValues, extractValue, delimiter, multiple, valueField, onChange, options, data, dispatchEvent, newValue, additonalOptions, rendererEvent;
+            var _a, joinValues, extractValue, delimiter, multiple, valueField, onChange, options, dispatchEvent, newValue, additonalOptions, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, onChange = _a.onChange, options = _a.options, _a.setOptions, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, onChange = _a.onChange, options = _a.options, _a.setOptions, _a.data, dispatchEvent = _a.dispatchEvent;
                         newValue = value;
                         additonalOptions = [];
                         (Array.isArray(value) ? value : value ? [value] : []).forEach(function (option) {
@@ -140,10 +140,11 @@ var UserSelectControl = /** @class */ (function (_super) {
                                 newValue = newValue ? newValue[valueField || 'value'] : '';
                             }
                         }
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, {
                                 value: newValue,
-                                options: options
-                            }))];
+                                options: options,
+                                items: options // 为了保持名字统一
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/lib/renderers/Grid.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Grid2D.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/HBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/IFrame.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Icon.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { RendererProps } from 'amis-core';
+import { RendererProps, IconCheckedSchema } from 'amis-core';
 import { BaseSchema, SchemaTpl } from '../Schema';
 import { BadgeObject } from 'amis-ui';
 /**
@@ -11,7 +11,7 @@ export interface IconSchema extends BaseSchema {
     /**
      * 按钮类型
      */
-    icon: SchemaTpl;
+    icon: SchemaTpl | IconCheckedSchema;
     vendor?: 'iconfont' | 'fa' | '';
     /**
      * 角标
@@ -22,7 +22,7 @@ export interface IconProps extends RendererProps, Omit<IconSchema, 'type' | 'cla
 }
 export declare class Icon extends React.Component<IconProps, object> {
     static defaultProps: Partial<IconProps>;
-    render(): JSX.Element;
+    render(): JSX.Element | undefined;
 }
 export declare class IconRenderer extends Icon {
 }

package/lib/renderers/Icon.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -12,6 +12,7 @@ var React = require('react');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var icons = require('amis-ui/lib/components/icons');
+var lodash = require('lodash');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -26,6 +27,15 @@ var Icon = /** @class */ (function (_super) {
         var _a = this.props, vendor = _a.vendor, cx = _a.classnames, className = _a.className, data = _a.data;
         var icon = this.props.icon;
         icon = amisCore.filter(icon, data);
+        if (typeof icon !== 'string') {
+            if (lodash.isObject(icon) &&
+                typeof icon.id === 'string' &&
+                icon.id.startsWith('svg-')) {
+                return (React__default["default"].createElement("svg", { className: cx('icon', className) },
+                    React__default["default"].createElement("use", { xlinkHref: "#".concat(icon.id.replace(/^svg-/, '')) })));
+            }
+            return;
+        }
         var CustomIcon = icons.getIcon(icon);
         if (CustomIcon) {
             return React__default["default"].createElement(CustomIcon, { className: cx(className, "icon-".concat(icon)) });

package/lib/renderers/Image.d.ts

@@ -119,7 +119,14 @@ export interface ImageThumbProps extends LocaleProps, ThemeProps, Omit<ImageSche
     onLoad?: React.EventHandler<any>;
     overlays?: JSX.Element;
 }
-export declare class ImageThumb extends React.Component<ImageThumbProps> {
+interface ImageThumbState {
+    imageLoading: boolean;
+}
+export declare class ImageThumb extends React.Component<ImageThumbProps, ImageThumbState> {
+    constructor(props: ImageThumbProps);
+    componentDidUpdate(preProps: ImageThumbProps): void;
+    handleImgLoaded(e: React.SyntheticEvent<HTMLImageElement, Event>): void;
+    handleImgError(e: React.SyntheticEvent<HTMLImageElement, Event>): void;
     handleEnlarge(): void;
     render(): JSX.Element;
 }