amis 2.3.2-beta.1 → 2.4.1-beta.0

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

@@ -68,6 +68,7 @@ export default class RatingControl extends React.Component<RatingProps, any> {
     static defaultProps: Partial<RatingProps>;
     doAction(action: ActionObject, data: object, throwErrors: boolean): void;
     handleChange(value: any): Promise<void>;
+    renderStatic(): JSX.Element;
     render(): JSX.Element;
 }
 export declare class RatingControlRenderer extends RatingControl {

package/lib/renderers/Form/InputRating.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.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 }; }
 
@@ -50,10 +51,18 @@ var RatingControl = /** @class */ (function (_super) {
             });
         });
     };
+    RatingControl.prototype.renderStatic = function () {
+        var _a = this.props, className = _a.className, value = _a.value, count = _a.count, half = _a.half, char = _a.char, inactiveColor = _a.inactiveColor, colors = _a.colors, texts = _a.texts, charClassName = _a.charClassName, textClassName = _a.textClassName, textPosition = _a.textPosition, cx = _a.classnames;
+        return (React__default["default"].createElement("div", { className: cx('RatingControl', className) },
+            React__default["default"].createElement(amisUi.Rating, { classnames: cx, value: value, disabled: true, count: count, half: half, char: char, inactiveColor: inactiveColor, colors: colors, texts: texts, charClassName: charClassName, textClassName: textClassName, textPosition: textPosition })));
+    };
     RatingControl.prototype.render = function () {
         var _a = this.props, className = _a.className, value = _a.value, count = _a.count, half = _a.half, readOnly = _a.readOnly, disabled = _a.disabled, onHoverChange = _a.onHoverChange, allowClear = _a.allowClear, char = _a.char, inactiveColor = _a.inactiveColor, colors = _a.colors, texts = _a.texts, charClassName = _a.charClassName, textClassName = _a.textClassName, textPosition = _a.textPosition, cx = _a.classnames;
+        var finalCount = getFinalCount(count, this.props.data);
+        // 限制最大 100 星，避免渲染卡死问题
+        finalCount > 100 && (finalCount = 100);
         return (React__default["default"].createElement("div", { className: cx('RatingControl', className) },
-            React__default["default"].createElement(amisUi.Rating, { classnames: cx, value: value, disabled: disabled, count: count, half: half, allowClear: allowClear, readOnly: readOnly, char: char, inactiveColor: inactiveColor, colors: colors, texts: texts, charClassName: charClassName, textClassName: textClassName, textPosition: textPosition, onChange: this.handleChange, onHoverChange: function (value) {
+            React__default["default"].createElement(amisUi.Rating, { classnames: cx, value: value, disabled: disabled, count: finalCount, half: half, allowClear: allowClear, readOnly: readOnly, char: char, inactiveColor: inactiveColor, colors: colors, texts: texts, charClassName: charClassName, textClassName: textClassName, textPosition: textPosition, onChange: this.handleChange, onHoverChange: function (value) {
                     onHoverChange && onHoverChange(value);
                 } })));
     };
@@ -69,8 +78,20 @@ var RatingControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], RatingControl.prototype, "handleChange", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], RatingControl.prototype, "render", null);
     return RatingControl;
 }(React__default["default"].Component));
+function getFinalCount(name, data) {
+    if (typeof name === 'number') {
+        return name;
+    }
+    return amisCore.toNumber(amisCore.filter(name, data));
+}
 /** @class */ ((function (_super) {
     tslib.__extends(RatingControlRenderer, _super);
     function RatingControlRenderer() {
@@ -79,7 +100,20 @@ var RatingControl = /** @class */ (function (_super) {
     RatingControlRenderer = tslib.__decorate([
         amisCore.FormItem({
             type: 'input-rating',
-            sizeMutable: false
+            sizeMutable: false,
+            shouldComponentUpdate: function (props, prevProps) {
+                return getFinalCount(props.count, props.data) !==
+                    getFinalCount(prevProps.count, prevProps.data);
+            },
+            detectProps: [
+                'half',
+                'allowClear',
+                'colors',
+                'inactiveColor',
+                'texts',
+                'textPosition',
+                'char'
+            ]
         })
     ], RatingControlRenderer);
     return RatingControlRenderer;

package/lib/renderers/Form/InputRepeat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRichText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FormControlProps, FormBaseControl, SimpleMap, RendererData, ActionObject } from 'amis-core';
+import { FormControlProps, FormBaseControl, SimpleMap, RendererData, ActionObject, ITableStore } from 'amis-core';
 import { TableSchema } from '../Table';
 import { SchemaApi } from '../../Schema';
 export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, 'type'> {
@@ -149,6 +149,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
     subForms: any;
     rowPrinstine: Array<any>;
     editting: any;
+    tableStore?: ITableStore;
     constructor(props: TableProps);
     componentDidUpdate(nextProps: TableProps): void;
     componentWillUnmount(): void;
@@ -180,6 +181,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
     handlePristineChange(data: Record<string, any>, rowIndex: string): void;
     removeEntry(entry: any): void;
     getEntryId(entry: any): string;
+    tableRef(ref: any): void;
     render(): JSX.Element | null;
 }
 export declare class TableControlRenderer extends FormTable {

package/lib/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -74,7 +74,7 @@ var FormTable = /** @class */ (function (_super) {
     };
     FormTable.prototype.validate = function () {
         return tslib.__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 tslib.__generator(this, function (_b) {
                 switch (_b.label) {
@@ -95,8 +95,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) &&
@@ -121,7 +121,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*/];
                 }
             });
         });
@@ -425,9 +432,11 @@ var FormTable = /** @class */ (function (_super) {
             btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
-                    return ~_this.state.editIndex && needConfirm !== false ? null : (React__default["default"].createElement(amisUi.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) },
+                    return (~_this.state.editIndex && needConfirm !== false) ||
+                        (_this.props.maxLength &&
+                            _this.props.maxLength <= _this.state.items.length) ? null : (React__default["default"].createElement(amisUi.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__default["default"].createElement("span", null, props.addBtnLabel) : null,
-                        props.addBtnIcon ? (React__default["default"].createElement(amisUi.Icon, { icon: props.addBtnIcon, className: "icon" })) : null));
+                        props.addBtnIcon ? (typeof props.addBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.addBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.addBtnIcon))) : null));
                 }
             });
         }
@@ -437,7 +446,7 @@ var FormTable = /** @class */ (function (_super) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return ~_this.state.editIndex && needConfirm !== false ? null : (React__default["default"].createElement(amisUi.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__default["default"].createElement("span", null, props.copyBtnLabel) : null,
-                        props.copyBtnIcon ? (React__default["default"].createElement(amisUi.Icon, { icon: props.copyBtnIcon, className: "icon" })) : null));
+                        props.copyBtnIcon ? (typeof props.copyBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.copyBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.copyBtnIcon))) : null));
                 }
             });
         }
@@ -466,7 +475,7 @@ var FormTable = /** @class */ (function (_super) {
                                 ? env.getModalContainer
                                 : undefined, onClick: function () { return _this.startEdit(rowIndex + offset); } },
                             props.updateBtnLabel || props.editBtnLabel ? (React__default["default"].createElement("span", null, props.updateBtnLabel || props.editBtnLabel)) : null,
-                            typeof props.updateBtnIcon !== 'undefined' ? (props.updateBtnIcon ? (React__default["default"].createElement(amisUi.Icon, { icon: props.updateBtnIcon, className: "icon" })) : null) : props.editBtnIcon ? (React__default["default"].createElement(amisUi.Icon, { icon: props.editBtnIcon, className: "icon" })) : null));
+                            typeof props.updateBtnIcon !== 'undefined' ? (props.updateBtnIcon ? (typeof props.updateBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.updateBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.updateBtnIcon))) : null) : props.editBtnIcon ? (typeof props.editBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.editBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.editBtnIcon))) : null));
                     }
                 });
             btns.push({
@@ -474,7 +483,7 @@ var FormTable = /** @class */ (function (_super) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return _this.state.editIndex === rowIndex + offset ? (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('save'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.confirmEdit },
                         props.confirmBtnLabel ? (React__default["default"].createElement("span", null, props.confirmBtnLabel)) : null,
-                        props.confirmBtnIcon ? (React__default["default"].createElement(amisUi.Icon, { icon: props.confirmBtnIcon, className: "icon" })) : null)) : null;
+                        props.confirmBtnIcon ? (typeof props.confirmBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.confirmBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.confirmBtnIcon))) : null)) : null;
                 }
             });
             btns.push({
@@ -482,7 +491,7 @@ var FormTable = /** @class */ (function (_super) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return _this.state.editIndex === rowIndex + offset ? (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('cancel'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.cancelEdit },
                         props.cancelBtnLabel ? (React__default["default"].createElement("span", null, props.cancelBtnLabel)) : null,
-                        props.cancelBtnIcon ? (React__default["default"].createElement(amisUi.Icon, { icon: props.cancelBtnIcon, className: "icon" })) : null)) : null;
+                        props.cancelBtnIcon ? (typeof props.cancelBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.cancelBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.cancelBtnIcon))) : null)) : null;
                 }
             });
         }
@@ -490,10 +499,12 @@ var FormTable = /** @class */ (function (_super) {
             btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, data = _a.data, offset = _a.offset;
-                    return (~_this.state.editIndex || (data && data.__isPlaceholder)) &&
-                        needConfirm !== false ? null : (React__default["default"].createElement(amisUi.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) },
+                    return ((~_this.state.editIndex || (data && data.__isPlaceholder)) &&
+                        needConfirm !== false) ||
+                        (_this.props.minLength &&
+                            _this.props.minLength >= _this.state.items.length) ? null : (React__default["default"].createElement(amisUi.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__default["default"].createElement("span", null, props.deleteBtnLabel)) : null,
-                        props.deleteBtnIcon ? (React__default["default"].createElement(amisUi.Icon, { icon: props.deleteBtnIcon, className: "icon" })) : null));
+                        props.deleteBtnIcon ? (typeof props.deleteBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.deleteBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.deleteBtnIcon))) : null));
                 }
             });
         }
@@ -632,10 +643,17 @@ 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;
-        var _c = this.props, className = _c.className; _c.value; var showAddBtn = _c.showAddBtn, disabled = _c.disabled, render = _c.render, placeholder = _c.placeholder, draggable = _c.draggable, addable = _c.addable, columnsTogglable = _c.columnsTogglable, combineNum = _c.combineNum, combineFromIndex = _c.combineFromIndex, __ = _c.translate, canAccessSuperData = _c.canAccessSuperData, expandConfig = _c.expandConfig, affixRow = _c.affixRow, prefixRow = _c.prefixRow, formInited = _c.formInited, perPage = _c.perPage, cx = _c.classnames, rowClassName = _c.rowClassName, rowClassNameExpr = _c.rowClassNameExpr, _d = _c.affixHeader, affixHeader = _d === void 0 ? false : _d, _e = _c.autoFillHeight, autoFillHeight = _e === void 0 ? false : _e, tableContentClassName = _c.tableContentClassName;
+        var _c = this.props, className = _c.className; _c.value; var showAddBtn = _c.showAddBtn, disabled = _c.disabled, render = _c.render, placeholder = _c.placeholder, draggable = _c.draggable, addable = _c.addable, columnsTogglable = _c.columnsTogglable, combineNum = _c.combineNum, combineFromIndex = _c.combineFromIndex, __ = _c.translate, canAccessSuperData = _c.canAccessSuperData, expandConfig = _c.expandConfig, affixRow = _c.affixRow, prefixRow = _c.prefixRow, formInited = _c.formInited, perPage = _c.perPage, cx = _c.classnames, rowClassName = _c.rowClassName, rowClassNameExpr = _c.rowClassNameExpr, _d = _c.affixHeader, affixHeader = _d === void 0 ? false : _d, _e = _c.autoFillHeight, autoFillHeight = _e === void 0 ? false : _e, tableContentClassName = _c.tableContentClassName, maxLength = _c.maxLength;
         if (formInited === false) {
             return null;
         }
@@ -662,6 +680,7 @@ var FormTable = /** @class */ (function (_super) {
                 autoFillHeight: autoFillHeight,
                 tableContentClassName: tableContentClassName
             }, {
+                ref: this.tableRef.bind(this),
                 value: undefined,
                 saveImmediately: true,
                 disabled: disabled,
@@ -684,7 +703,10 @@ var FormTable = /** @class */ (function (_super) {
                 // TODO: 这里是为了处理columns里使用value变量添加的，目前会影响初始化数据加载后的组件行为，先回滚
                 // onPristineChange: this.handlePristineChange
             }),
-            (addable && showAddBtn !== false) || showPager ? (React__default["default"].createElement("div", { className: cx('InputTable-toolbar') },
+            (addable &&
+                showAddBtn !== false &&
+                (!maxLength || maxLength > items.length)) ||
+                showPager ? (React__default["default"].createElement("div", { className: cx('InputTable-toolbar') },
                 addable && showAddBtn !== false ? (React__default["default"].createElement(amisUi.Button, { disabled: disabled, size: "sm", onClick: function () { return _this.addItem(_this.state.items.length); } },
                     React__default["default"].createElement(amisUi.Icon, { icon: "plus", className: "icon" }),
                     React__default["default"].createElement("span", null, __('add')))) : null,

package/lib/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -16,6 +16,7 @@ var isInteger = require('lodash/isInteger');
 var unionWith = require('lodash/unionWith');
 var ReactDOM = require('react-dom');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -450,6 +451,12 @@ var TagControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], TagControl.prototype, "isReachMax", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TagControl.prototype, "render", null);
     return TagControl;
 }(React__default["default"].PureComponent));
 /** @class */ ((function (_super) {

package/lib/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 {
@@ -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/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.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 amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -253,12 +254,14 @@ var TextControl = /** @class */ (function (_super) {
         });
     };
     TextControl.prototype.handleKeyDown = function (evt) {
+        var _a;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, selectedOptions, onChange, multiple, creatable, dispatchEvent, newValue, value_1, newValue, rendererEvent;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            var _b, selectedOptions, onChange, multiple, creatable, dispatchEvent, valueField, newValue, value_1, newValue, rendererEvent;
+            return tslib.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        _a = this.props, selectedOptions = _a.selectedOptions, onChange = _a.onChange, multiple = _a.multiple, creatable = _a.creatable, dispatchEvent = _a.dispatchEvent;
+                        _b = this.props, selectedOptions = _b.selectedOptions, onChange = _b.onChange, multiple = _b.multiple, creatable = _b.creatable, dispatchEvent = _b.dispatchEvent;
+                        valueField = ((_a = this.props) === null || _a === void 0 ? void 0 : _a.valueField) || 'value';
                         if (!(selectedOptions.length && !this.state.inputValue && evt.keyCode === 8)) return [3 /*break*/, 1];
                         evt.preventDefault();
                         newValue = selectedOptions.concat();
@@ -275,25 +278,28 @@ var TextControl = /** @class */ (function (_super) {
                             creatable !== false)) return [3 /*break*/, 3];
                         evt.preventDefault();
                         value_1 = this.state.inputValue;
-                        if (multiple &&
-                            value_1 &&
-                            !find__default["default"](selectedOptions, function (item) { return item.value == value_1; })) {
-                            newValue = selectedOptions.concat();
-                            newValue.push({
-                                label: value_1,
-                                value: value_1
-                            });
-                            value_1 = this.normalizeValue(newValue).concat();
+                        if (multiple && value_1) {
+                            if (!find__default["default"](selectedOptions, function (item) { return item[valueField] == value_1; })) {
+                                newValue = selectedOptions.concat();
+                                newValue.push({
+                                    label: value_1,
+                                    value: value_1
+                                });
+                                value_1 = this.normalizeValue(newValue).concat();
+                            }
+                            else {
+                                value_1 = this.normalizeValue(selectedOptions).concat();
+                            }
                         }
                         return [4 /*yield*/, dispatchEvent('enter', amisCore.resolveEventData(this.props, { value: value_1 }, 'value'))];
                     case 2:
-                        rendererEvent = _b.sent();
+                        rendererEvent = _c.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
                         onChange(value_1);
                         this.setState({
-                            inputValue: '',
+                            inputValue: multiple ? '' : value_1,
                             isOpen: false
                         }, this.loadAutoComplete);
                         return [3 /*break*/, 4];
@@ -305,7 +311,7 @@ var TextControl = /** @class */ (function (_super) {
                                 isOpen: false
                             });
                         }
-                        _b.label = 4;
+                        _c.label = 4;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -364,19 +370,27 @@ var TextControl = /** @class */ (function (_super) {
     };
     TextControl.prototype.handleNormalInputChange = function (e) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, dispatchEvent, value, rendererEvent;
+            var _a, onChange, dispatchEvent, trimContents, clearValueOnEmpty, value, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
-                        value = e.currentTarget.value;
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: this.transformValue(value) }, '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', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
                         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*/];
                 }
             });
@@ -460,7 +474,8 @@ var TextControl = /** @class */ (function (_super) {
             if (_this.state.inputValue &&
                 creatable !== false &&
                 multiple &&
-                !filtedOptions.some(function (option) { return option.value === _this.state.inputValue; })) {
+                !filtedOptions.some(function (option) { return option.value === _this.state.inputValue; }) &&
+                !~selectedItem.indexOf(_this.state.inputValue)) {
                 filtedOptions.push((_b = {},
                     _b[labelField || 'label'] = _this.state.inputValue,
                     _b[valueField || 'value'] = _this.state.inputValue,
@@ -543,37 +558,46 @@ var TextControl = /** @class */ (function (_super) {
             showCounter ? (React__default["default"].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__default["default"].createElement("span", { className: cx('TextControl-inputSuffix') }, amisCore.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 = amisCore.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__default["default"].createElement("div", { className: cx("".concat(ns, "TextControl-button"), addOn.className) }, render('addOn', addOn, {
             disabled: disabled
         }))) : (React__default["default"].createElement("div", { className: cx("".concat(ns, "TextControl-addOn"), addOn.className) },
             iconElement,
             addOn.label ? amisCore.filter(addOn.label, data) : null))) : null;
         if (inputOnly) {
-            return input;
+            return body;
         }
-        return (React__default["default"].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__default["default"].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',
@@ -588,6 +612,12 @@ var TextControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], TextControl.prototype, "handleNormalInputChange", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", Object)
+    ], TextControl.prototype, "render", null);
     return TextControl;
 }(React__default["default"].PureComponent));
 function mapItemIndex(items, values, valueField) {

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -12,6 +12,7 @@ var React = require('react');
 var cx = require('classnames');
 var amisUi = require('amis-ui');
 var amisCore = require('amis-core');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -109,6 +110,12 @@ var TreeControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TreeControl.prototype, "domRef", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TreeControl.prototype, "render", null);
     return TreeControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/InputYearRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -13,6 +13,7 @@ var amisCore = require('amis-core');
 var cx = require('classnames');
 var InputDateRange = require('./InputDateRange.js');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -29,6 +30,12 @@ var YearRangeControl = /** @class */ (function (_super) {
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "DateRangeControl"), className) },
             React__default["default"].createElement(amisUi.DateRangePicker, tslib.__assign({ viewMode: "years", format: format, classPrefix: ns, data: data }, rest, { minDate: minDate ? amisCore.filterDate(minDate, data, format) : undefined, maxDate: maxDate ? amisCore.filterDate(maxDate, data, format) : undefined, minDuration: minDuration ? amisCore.parseDuration(minDuration) : undefined, maxDuration: maxDuration ? amisCore.parseDuration(maxDuration) : undefined, onChange: this.handleChange, onFocus: this.dispatchEvent, onBlur: this.dispatchEvent }))));
     };
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], YearRangeControl.prototype, "render", null);
     return YearRangeControl;
 }(InputDateRange["default"]));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/JSONSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchemaEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/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 {