amis 2.3.1 → 2.4.0

package/esm/renderers/Form/InputTable.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __decorate, __metadata, __spreadArray } from 'tslib';
 import React from 'react';
-import { SimpleMap, getVariable, dataMapping, isEffectiveApi, filterDate, setVariable, isExpression, createObject, filter, getTree, spliceTree, autobind, FormItem } from 'amis-core';
+import { SimpleMap, getVariable, dataMapping, isEffectiveApi, filterDate, setVariable, isExpression, createObject, filter, generateIcon, getTree, spliceTree, autobind, FormItem } from 'amis-core';
 import { Button, Icon } from 'amis-ui';
 import omit from 'lodash/omit';
 import findIndex from 'lodash/findIndex';
@@ -59,7 +59,7 @@ var FormTable = /** @class */ (function (_super) {
     };
     FormTable.prototype.validate = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, value, minLength, maxLength, __, columns, subForms_1, results, msg, uniqueColumn_1;
+            var _a, value, minLength, maxLength, __, columns, subForms_1, results_1, msg, uniqueColumn_1, children;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -80,8 +80,8 @@ var FormTable = /** @class */ (function (_super) {
                         if (!subForms_1.length) return [3 /*break*/, 4];
                         return [4 /*yield*/, Promise.all(subForms_1.map(function (item) { return item.validate(); }))];
                     case 3:
-                        results = _b.sent();
-                        msg = ~results.indexOf(false) ? __('Form.validateFailed') : '';
+                        results_1 = _b.sent();
+                        msg = ~results_1.indexOf(false) ? __('Form.validateFailed') : '';
                         uniqueColumn_1 = '';
                         if (!msg &&
                             Array.isArray(columns) &&
@@ -106,7 +106,14 @@ var FormTable = /** @class */ (function (_super) {
                             });
                         }
                         return [2 /*return*/, msg];
-                    case 4: return [2 /*return*/];
+                    case 4:
+                        if (!this.tableStore)
+                            return [2 /*return*/];
+                        children = this.tableStore.children.filter(function (item) { return (item === null || item === void 0 ? void 0 : item.storeType) === 'FormItemStore'; });
+                        return [4 /*yield*/, Promise.all(children.map(function (item) { return item.validate(_this.props.value); }))];
+                    case 5:
+                        _b.sent();
+                        return [2 /*return*/];
                 }
             });
         });
@@ -412,7 +419,7 @@ var FormTable = /** @class */ (function (_super) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return ~_this.state.editIndex && needConfirm !== false ? null : (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.addRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.addItem.bind(_this, rowIndex + offset, undefined) },
                         props.addBtnLabel ? React.createElement("span", null, props.addBtnLabel) : null,
-                        props.addBtnIcon ? (React.createElement(Icon, { icon: props.addBtnIcon, className: "icon" })) : null));
+                        props.addBtnIcon ? (typeof props.addBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.addBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.addBtnIcon))) : null));
                 }
             });
         }
@@ -422,7 +429,7 @@ var FormTable = /** @class */ (function (_super) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return ~_this.state.editIndex && needConfirm !== false ? null : (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.copyRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.copyItem.bind(_this, rowIndex + offset, undefined) },
                         props.copyBtnLabel ? React.createElement("span", null, props.copyBtnLabel) : null,
-                        props.copyBtnIcon ? (React.createElement(Icon, { icon: props.copyBtnIcon, className: "icon" })) : null));
+                        props.copyBtnIcon ? (typeof props.copyBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.copyBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.copyBtnIcon))) : null));
                 }
             });
         }
@@ -451,7 +458,7 @@ var FormTable = /** @class */ (function (_super) {
                                 ? env.getModalContainer
                                 : undefined, onClick: function () { return _this.startEdit(rowIndex + offset); } },
                             props.updateBtnLabel || props.editBtnLabel ? (React.createElement("span", null, props.updateBtnLabel || props.editBtnLabel)) : null,
-                            typeof props.updateBtnIcon !== 'undefined' ? (props.updateBtnIcon ? (React.createElement(Icon, { icon: props.updateBtnIcon, className: "icon" })) : null) : props.editBtnIcon ? (React.createElement(Icon, { icon: props.editBtnIcon, className: "icon" })) : null));
+                            typeof props.updateBtnIcon !== 'undefined' ? (props.updateBtnIcon ? (typeof props.updateBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.updateBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.updateBtnIcon))) : null) : props.editBtnIcon ? (typeof props.editBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.editBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.editBtnIcon))) : null));
                     }
                 });
             btns.push({
@@ -459,7 +466,7 @@ var FormTable = /** @class */ (function (_super) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return _this.state.editIndex === rowIndex + offset ? (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('save'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.confirmEdit },
                         props.confirmBtnLabel ? (React.createElement("span", null, props.confirmBtnLabel)) : null,
-                        props.confirmBtnIcon ? (React.createElement(Icon, { icon: props.confirmBtnIcon, className: "icon" })) : null)) : null;
+                        props.confirmBtnIcon ? (typeof props.confirmBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.confirmBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.confirmBtnIcon))) : null)) : null;
                 }
             });
             btns.push({
@@ -467,7 +474,7 @@ var FormTable = /** @class */ (function (_super) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return _this.state.editIndex === rowIndex + offset ? (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('cancel'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.cancelEdit },
                         props.cancelBtnLabel ? (React.createElement("span", null, props.cancelBtnLabel)) : null,
-                        props.cancelBtnIcon ? (React.createElement(Icon, { icon: props.cancelBtnIcon, className: "icon" })) : null)) : null;
+                        props.cancelBtnIcon ? (typeof props.cancelBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.cancelBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.cancelBtnIcon))) : null)) : null;
                 }
             });
         }
@@ -478,7 +485,7 @@ var FormTable = /** @class */ (function (_super) {
                     return (~_this.state.editIndex || (data && data.__isPlaceholder)) &&
                         needConfirm !== false ? null : (React.createElement(Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.deleteRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.removeItem.bind(_this, rowIndex + offset) },
                         props.deleteBtnLabel ? (React.createElement("span", null, props.deleteBtnLabel)) : null,
-                        props.deleteBtnIcon ? (React.createElement(Icon, { icon: props.deleteBtnIcon, className: "icon" })) : null));
+                        props.deleteBtnIcon ? (typeof props.deleteBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.deleteBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.deleteBtnIcon))) : null));
                 }
             });
         }
@@ -617,6 +624,13 @@ var FormTable = /** @class */ (function (_super) {
         }
         return String(this.entries.get(entry));
     };
+    FormTable.prototype.tableRef = function (ref) {
+        var _a;
+        while (ref && ref.getWrappedInstance) {
+            ref = ref.getWrappedInstance();
+        }
+        this.tableStore = (_a = ref === null || ref === void 0 ? void 0 : ref.props) === null || _a === void 0 ? void 0 : _a.store;
+    };
     FormTable.prototype.render = function () {
         var _this = this;
         var _a, _b;
@@ -647,6 +661,7 @@ var FormTable = /** @class */ (function (_super) {
                 autoFillHeight: autoFillHeight,
                 tableContentClassName: tableContentClassName
             }, {
+                ref: this.tableRef.bind(this),
                 value: undefined,
                 saveImmediately: true,
                 disabled: disabled,

package/esm/renderers/Form/InputTag.js

@@ -1,17 +1,18 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { createObject, filterTree, Overlay, PopOver, autobind, OptionsControl } from 'amis-core';
+import { resolveEventData, filterTree, Overlay, PopOver, autobind, OptionsControl } from 'amis-core';
 import Downshift from 'downshift';
 import find from 'lodash/find';
 import isInteger from 'lodash/isInteger';
 import unionWith from 'lodash/unionWith';
 import { findDOMNode } from 'react-dom';
 import { ResultBox, Spinner, ListMenu } from 'amis-ui';
+import { supportStatic } from './StaticHoc.js';
 
 var TagControl = /** @class */ (function (_super) {
     __extends(TagControl, _super);
@@ -46,12 +47,12 @@ var TagControl = /** @class */ (function (_super) {
     TagControl.prototype.dispatchEvent = function (eventName, eventData) {
         if (eventData === void 0) { eventData = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, options, data, rendererEvent;
+            var _a, dispatchEvent, options, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options, data = _a.data;
-                        return [4 /*yield*/, dispatchEvent(eventName, createObject(data, __assign({ options: options }, eventData)))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, options = _a.options;
+                        return [4 /*yield*/, dispatchEvent(eventName, resolveEventData(this.props, __assign({ options: options, items: options }, eventData), 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         // 返回阻塞标识
@@ -340,7 +341,7 @@ var TagControl = /** @class */ (function (_super) {
                                     disabled: reachMax || item.disabled,
                                     className: cx('ListMenu-item', {
                                         'is-disabled': reachMax
-                                    }),
+                                    })
                                 })));
                             } })))) : (
                 // 保留原来的展现方式，不推荐
@@ -438,6 +439,12 @@ var TagControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", void 0)
     ], TagControl.prototype, "isReachMax", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], TagControl.prototype, "render", null);
     return TagControl;
 }(React.PureComponent));
 /** @class */ ((function (_super) {

package/esm/renderers/Form/InputText.d.ts

@@ -64,6 +64,8 @@ export interface TextControlSchema extends FormOptionsSchema {
     inputControlClassName?: string;
     /** 原生input标签的CSS类名 */
     nativeInputClassName?: string;
+    /** 在内容为空的时候清除值 */
+    clearValueOnEmpty?: boolean;
 }
 export declare type InputTextRendererEvent = 'blur' | 'focus' | 'click' | 'change' | 'enter';
 export interface TextProps extends OptionsControlProps {
@@ -110,9 +112,9 @@ export default class TextControl extends React.PureComponent<TextProps, TextStat
     focus(): void;
     clearValue(): void;
     removeItem(index: number): void;
-    handleClick(): void;
-    handleFocus(e: any): void;
-    handleBlur(e: any): void;
+    handleClick(): Promise<void>;
+    handleFocus(e: any): Promise<void>;
+    handleBlur(e: any): Promise<void>;
     handleInputChange(evt: React.ChangeEvent<HTMLInputElement>): Promise<void>;
     handleKeyDown(evt: React.KeyboardEvent<HTMLInputElement>): Promise<void>;
     handleChange(value: any): void;
@@ -126,6 +128,7 @@ export default class TextControl extends React.PureComponent<TextProps, TextStat
     renderSugestMode(): JSX.Element;
     toggleRevealPassword(): void;
     renderNormal(): JSX.Element;
+    renderBody(body: JSX.Element): JSX.Element;
     render(): JSX.Element;
 }
 export declare function mapItemIndex(items: Array<any>, values: Array<any>, valueField?: string): any;

package/esm/renderers/Form/InputText.js

@@ -1,16 +1,17 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { isEffectiveApi, createObject, setVariable, rendererEventDispatcher, ucFirst, highlight, filter, generateIcon, bindRendererEvent, autobind, OptionsControl } from 'amis-core';
+import { isEffectiveApi, createObject, setVariable, resolveEventData, ucFirst, highlight, filter, generateIcon, autobind, OptionsControl } from 'amis-core';
 import Downshift from 'downshift';
 import { matchSorter } from 'match-sorter';
 import debouce from 'lodash/debounce';
 import find from 'lodash/find';
 import { Icon, Input, Spinner } from 'amis-ui';
+import { supportStatic } from './StaticHoc.js';
 
 var TextControl = /** @class */ (function (_super) {
     __extends(TextControl, _super);
@@ -136,43 +137,96 @@ var TextControl = /** @class */ (function (_super) {
         onChange(this.normalizeValue(newValue));
     };
     TextControl.prototype.handleClick = function () {
-        // 已经 focus 的就不重复执行，否则总重新定位光标
-        this.state.isFocused || this.focus();
-        this.setState({
-            isOpen: true
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+                        return [4 /*yield*/, dispatchEvent('click', resolveEventData(this.props, {
+                                value: value
+                            }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        // 已经 focus 的就不重复执行，否则总重新定位光标
+                        this.state.isFocused || this.focus();
+                        this.setState({
+                            isOpen: true
+                        });
+                        return [2 /*return*/];
+                }
+            });
         });
     };
     TextControl.prototype.handleFocus = function (e) {
-        this.setState({
-            isOpen: true,
-            isFocused: true
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, onFocus, value, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, onFocus = _a.onFocus, value = _a.value;
+                        this.setState({
+                            isOpen: true,
+                            isFocused: true
+                        });
+                        return [4 /*yield*/, dispatchEvent('focus', resolveEventData(this.props, {
+                                value: value
+                            }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
+                        return [2 /*return*/];
+                }
+            });
         });
-        this.props.onFocus && this.props.onFocus(e);
     };
     TextControl.prototype.handleBlur = function (e) {
-        var _a = this.props, onBlur = _a.onBlur, trimContents = _a.trimContents, value = _a.value, onChange = _a.onChange;
-        this.setState({
-            isFocused: false
-        }, function () {
-            if (trimContents && value && typeof value === 'string') {
-                onChange(value.trim());
-            }
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, onBlur, trimContents, value, onChange, dispatchEvent, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, onBlur = _a.onBlur, trimContents = _a.trimContents, value = _a.value, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+                        this.setState({
+                            isFocused: false
+                        }, function () {
+                            if (trimContents && value && typeof value === 'string') {
+                                onChange(value.trim());
+                            }
+                        });
+                        return [4 /*yield*/, dispatchEvent('blur', resolveEventData(this.props, {
+                                value: value
+                            }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onBlur && onBlur(e);
+                        return [2 /*return*/];
+                }
+            });
         });
-        onBlur && onBlur(e);
     };
     TextControl.prototype.handleInputChange = function (evt) {
         return __awaiter(this, void 0, void 0, function () {
-            var value, _a, creatable, multiple, onChange, dispatcher;
+            var value, _a, creatable, multiple, onChange, dispatchEvent, rendererEvent;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         value = this.transformValue(evt.currentTarget.value);
-                        _a = this.props, creatable = _a.creatable, multiple = _a.multiple, onChange = _a.onChange;
-                        return [4 /*yield*/, rendererEventDispatcher(this.props, 'change', { value: value })];
+                        _a = this.props, creatable = _a.creatable, multiple = _a.multiple, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
-                        dispatcher = _b.sent();
-                        if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
                         this.setState({
@@ -190,11 +244,11 @@ var TextControl = /** @class */ (function (_super) {
     };
     TextControl.prototype.handleKeyDown = function (evt) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, selectedOptions, onChange, multiple, creatable, newValue, value_1, newValue, dispatcher;
+            var _a, selectedOptions, onChange, multiple, creatable, dispatchEvent, newValue, value_1, newValue, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, selectedOptions = _a.selectedOptions, onChange = _a.onChange, multiple = _a.multiple, creatable = _a.creatable;
+                        _a = this.props, selectedOptions = _a.selectedOptions, onChange = _a.onChange, multiple = _a.multiple, creatable = _a.creatable, dispatchEvent = _a.dispatchEvent;
                         if (!(selectedOptions.length && !this.state.inputValue && evt.keyCode === 8)) return [3 /*break*/, 1];
                         evt.preventDefault();
                         newValue = selectedOptions.concat();
@@ -221,10 +275,10 @@ var TextControl = /** @class */ (function (_super) {
                             });
                             value_1 = this.normalizeValue(newValue).concat();
                         }
-                        return [4 /*yield*/, rendererEventDispatcher(this.props, 'enter', { value: value_1 })];
+                        return [4 /*yield*/, dispatchEvent('enter', resolveEventData(this.props, { value: value_1 }, 'value'))];
                     case 2:
-                        dispatcher = _b.sent();
-                        if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
                         onChange(value_1);
@@ -300,19 +354,27 @@ var TextControl = /** @class */ (function (_super) {
     };
     TextControl.prototype.handleNormalInputChange = function (e) {
         return __awaiter(this, void 0, void 0, function () {
-            var onChange, value, dispatcher;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a, onChange, dispatchEvent, trimContents, clearValueOnEmpty, value, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        onChange = this.props.onChange;
-                        value = e.currentTarget.value;
-                        return [4 /*yield*/, rendererEventDispatcher(this.props, 'change', { value: this.transformValue(value) })];
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent, trimContents = _a.trimContents, clearValueOnEmpty = _a.clearValueOnEmpty;
+                        value = this.transformValue(e.currentTarget.value);
+                        if (typeof value === 'string') {
+                            if (trimContents) {
+                                value = value.trim();
+                            }
+                            if (clearValueOnEmpty && value === '') {
+                                value = undefined;
+                            }
+                        }
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
-                        dispatcher = _a.sent();
-                        if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
-                        onChange(this.transformValue(value));
+                        onChange(value);
                         return [2 /*return*/];
                 }
             });
@@ -479,37 +541,46 @@ var TextControl = /** @class */ (function (_super) {
             showCounter ? (React.createElement("span", { className: cx('TextControl-counter') }, "".concat((_c = this.valueToString(value)) === null || _c === void 0 ? void 0 : _c.length).concat(typeof maxLength === 'number' && maxLength ? "/".concat(maxLength) : ''))) : null,
             suffix ? (React.createElement("span", { className: cx('TextControl-inputSuffix') }, filter(suffix, data))) : null));
     };
-    TextControl.prototype.render = function () {
-        var _a;
-        var _b = this.props, cx = _b.classnames, className = _b.className, ns = _b.classPrefix, options = _b.options, source = _b.source, autoComplete = _b.autoComplete, addOnRaw = _b.addOn, render = _b.render, data = _b.data, disabled = _b.disabled, inputOnly = _b.inputOnly;
+    TextControl.prototype.renderBody = function (body) {
+        var _a, _b;
+        var _c = this.props, cx = _c.classnames, className = _c.className, ns = _c.classPrefix, addOnRaw = _c.addOn, render = _c.render, data = _c.data, disabled = _c.disabled, inputOnly = _c.inputOnly, isStatic = _c.static;
         var addOn = typeof addOnRaw === 'string'
             ? {
                 label: addOnRaw,
                 type: 'plain'
             }
             : addOnRaw;
-        var input = autoComplete !== false && (source || options.length || autoComplete)
-            ? this.renderSugestMode()
-            : this.renderNormal();
         var iconElement = generateIcon(cx, addOn === null || addOn === void 0 ? void 0 : addOn.icon, 'Icon');
-        var addOnDom = addOn ? (addOn.actionType ||
+        var addOnDom = addOn && !isStatic ? (addOn.actionType ||
             ~['button', 'submit', 'reset', 'action'].indexOf(addOn.type) ? (React.createElement("div", { className: cx("".concat(ns, "TextControl-button"), addOn.className) }, render('addOn', addOn, {
             disabled: disabled
         }))) : (React.createElement("div", { className: cx("".concat(ns, "TextControl-addOn"), addOn.className) },
             iconElement,
             addOn.label ? filter(addOn.label, data) : null))) : null;
         if (inputOnly) {
-            return input;
+            return body;
         }
-        return (React.createElement("div", { className: cx(className, "".concat(ns, "TextControl"), (_a = {},
+        var classNames = !isStatic
+            ? cx(className, "".concat(ns, "TextControl"), (_a = {},
                 _a["".concat(ns, "TextControl--withAddOn")] = !!addOnDom,
                 _a['is-focused'] = this.state.isFocused,
                 _a['is-disabled'] = disabled,
-                _a)) },
+                _a))
+            : cx("".concat(ns, "TextControl"), (_b = {},
+                _b["".concat(ns, "TextControl--withAddOn")] = !!addOnDom,
+                _b));
+        return (React.createElement("div", { className: classNames },
             addOn && addOn.position === 'left' ? addOnDom : null,
-            input,
+            body,
             addOn && addOn.position !== 'left' ? addOnDom : null));
     };
+    TextControl.prototype.render = function () {
+        var _a = this.props, options = _a.options, source = _a.source, autoComplete = _a.autoComplete;
+        var input = autoComplete !== false && (source || (options === null || options === void 0 ? void 0 : options.length) || autoComplete)
+            ? this.renderSugestMode()
+            : this.renderNormal();
+        return this.renderBody(input);
+    };
     TextControl.defaultProps = {
         resetValue: '',
         labelField: 'label',
@@ -518,30 +589,18 @@ var TextControl = /** @class */ (function (_super) {
         allowInputText: true,
         trimContents: true
     };
-    __decorate([
-        bindRendererEvent('click'),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], TextControl.prototype, "handleClick", null);
-    __decorate([
-        bindRendererEvent('focus'),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Object]),
-        __metadata("design:returntype", void 0)
-    ], TextControl.prototype, "handleFocus", null);
-    __decorate([
-        bindRendererEvent('blur'),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [Object]),
-        __metadata("design:returntype", void 0)
-    ], TextControl.prototype, "handleBlur", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", Promise)
     ], TextControl.prototype, "handleNormalInputChange", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", Object)
+    ], TextControl.prototype, "render", null);
     return TextControl;
 }(React.PureComponent));
 function mapItemIndex(items, values, valueField) {

package/esm/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -7,7 +7,8 @@ import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib
 import React from 'react';
 import cx from 'classnames';
 import { Spinner, Tree } from 'amis-ui';
-import { createObject, isPureVariable, resolveVariableAndFilter, autobind, OptionsControl } from 'amis-core';
+import { resolveEventData, isPureVariable, resolveVariableAndFilter, autobind, OptionsControl } from 'amis-core';
+import { supportStatic } from './StaticHoc.js';
 
 var TreeControl = /** @class */ (function (_super) {
     __extends(TreeControl, _super);
@@ -37,14 +38,12 @@ var TreeControl = /** @class */ (function (_super) {
     };
     TreeControl.prototype.handleChange = function (value) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, dispatchEvent, data, rendererEvent;
+            var _a, onChange, dispatchEvent, rendererEvent;
             return __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', createObject(data, {
-                                value: value
-                            }))];
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -102,6 +101,12 @@ var TreeControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
     ], TreeControl.prototype, "domRef", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], TreeControl.prototype, "render", null);
     return TreeControl;
 }(React.Component));
 /** @class */ ((function (_super) {

package/esm/renderers/Form/InputYearRange.js

@@ -1,14 +1,15 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __rest, __assign, __decorate } from 'tslib';
+import { __extends, __rest, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import { filterDate, parseDuration, FormItem } from 'amis-core';
 import cx from 'classnames';
 import DateRangeControl from './InputDateRange.js';
 import { DateRangePicker } from 'amis-ui';
+import { supportStatic } from './StaticHoc.js';
 
 var YearRangeControl = /** @class */ (function (_super) {
     __extends(YearRangeControl, _super);
@@ -20,6 +21,12 @@ var YearRangeControl = /** @class */ (function (_super) {
         return (React.createElement("div", { className: cx("".concat(ns, "DateRangeControl"), className) },
             React.createElement(DateRangePicker, __assign({ viewMode: "years", format: format, classPrefix: ns, data: data }, rest, { minDate: minDate ? filterDate(minDate, data, format) : undefined, maxDate: maxDate ? filterDate(maxDate, data, format) : undefined, minDuration: minDuration ? parseDuration(minDuration) : undefined, maxDuration: maxDuration ? parseDuration(maxDuration) : undefined, onChange: this.handleChange, onFocus: this.dispatchEvent, onBlur: this.dispatchEvent }))));
     };
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], YearRangeControl.prototype, "render", null);
     return YearRangeControl;
 }(DateRangeControl));
 /** @class */ ((function (_super) {

package/esm/renderers/Form/JSONSchema.js

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

package/esm/renderers/Form/JSONSchemaEditor.js

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

package/esm/renderers/Form/ListSelect.d.ts

@@ -39,6 +39,7 @@ export default class ListControl extends React.Component<ListProps, any> {
     handleDBClick(option: Option, e: React.MouseEvent<HTMLElement>): void;
     handleClick(option: Option, e: React.MouseEvent<HTMLElement>): void;
     reload(): void;
+    renderStatic(displayValue?: string): string | JSX.Element;
     render(): JSX.Element;
 }
 export declare class ListControlRenderer extends ListControl {