amis 2.3.2-beta.1 → 2.4.0

package/lib/renderers/Form/InputImage.js

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

package/lib/renderers/Form/InputMonthRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.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 MonthRangeControl = /** @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: "months", 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)
+    ], MonthRangeControl.prototype, "render", null);
     return MonthRangeControl;
 }(InputDateRange["default"]));
 /** @class */ ((function (_super) {

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

@@ -70,6 +70,9 @@ export interface NumberProps extends FormControlProps {
     max?: number | string;
     min?: number | string;
     step?: number;
+    /**
+     *  精度
+     */
     precision?: number;
     /**
      * 边框模式，全边框，还是半边框，或者没边框。
@@ -122,11 +125,13 @@ export default class NumberControl extends React.Component<NumberProps, NumberSt
     getValue(inputValue: any): any;
     dispatchEvent(eventName: string): Promise<void>;
     handleChange(inputValue: any): Promise<void>;
+    /** 处理数字类的props，支持从数据域获取变量值 */
     filterNum(value: number | string | undefined): number | undefined;
     handleChangeUnit(option: Option): void;
     componentDidUpdate(prevProps: NumberProps): void;
     inputRef(ref: any): void;
     focus(): void;
+    renderStatic(displayValue?: string): JSX.Element;
     render(): JSX.Element;
 }
 export declare class NumberControlRenderer extends NumberControl {

package/lib/renderers/Form/InputNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -13,6 +13,7 @@ var MiniDecimal = require('../../node_modules/rc-input-number/lib/utils/MiniDeci
 var amisCore = require('amis-core');
 var cx = require('classnames');
 var amisUi = require('amis-ui');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -27,8 +28,8 @@ var NumberControl = /** @class */ (function (_super) {
         _this.handleChangeUnit = _this.handleChangeUnit.bind(_this);
         var unit = _this.getUnit();
         var unitOptions = amisCore.normalizeOptions(props.unitOptions);
-        var formItem = props.formItem, setPrinstineValue = props.setPrinstineValue, precision = props.precision, value = props.value;
-        var normalizedPrecision = _this.filterNum(precision);
+        var formItem = props.formItem, setPrinstineValue = props.setPrinstineValue, precision = props.precision, step = props.step, value = props.value;
+        var normalizedPrecision = amisUi.NumberInput.normalizePrecision(_this.filterNum(precision), _this.filterNum(step));
         /**
          * 如果设置了precision需要处理入参value的精度
          * 如果是带有单位的输入，则不支持精度处理
@@ -50,12 +51,13 @@ var NumberControl = /** @class */ (function (_super) {
      */
     NumberControl.prototype.doAction = function (action, args) {
         var actionType = action === null || action === void 0 ? void 0 : action.actionType;
-        var _a = this.props, resetValue = _a.resetValue, onChange = _a.onChange;
+        var _a = this.props, min = _a.min, max = _a.max, precision = _a.precision, step = _a.step, resetValue = _a.resetValue, big = _a.big, onChange = _a.onChange;
         if (actionType === 'clear') {
             onChange === null || onChange === void 0 ? void 0 : onChange('');
         }
         else if (actionType === 'reset') {
-            var value = this.getValue(resetValue !== null && resetValue !== void 0 ? resetValue : '');
+            var finalPrecision = amisUi.NumberInput.normalizePrecision(this.filterNum(precision), this.filterNum(step));
+            var value = amisUi.NumberInput.normalizeValue(resetValue !== null && resetValue !== void 0 ? resetValue : '', this.filterNum(min), this.filterNum(max), finalPrecision, resetValue !== null && resetValue !== void 0 ? resetValue : '', big);
             onChange === null || onChange === void 0 ? void 0 : onChange(value);
         }
     };
@@ -128,6 +130,7 @@ var NumberControl = /** @class */ (function (_super) {
             });
         });
     };
+    /** 处理数字类的props，支持从数据域获取变量值 */
     NumberControl.prototype.filterNum = function (value) {
         if (typeof value === 'undefined') {
             return undefined;
@@ -145,15 +148,15 @@ var NumberControl = /** @class */ (function (_super) {
         var prevUnitValue = this.state.unit;
         this.setState({ unit: option.value }, function () {
             if (value) {
-                value = value.replace(prevUnitValue, '');
+                value = value.toString().replace(prevUnitValue, '');
                 _this.props.onChange(value + _this.state.unit);
             }
         });
     };
     NumberControl.prototype.componentDidUpdate = function (prevProps) {
-        if (!isNaN(this.props.value) &&
-            !isNaN(prevProps.value) &&
-            this.props.value !== prevProps.value) {
+        // 匹配 数字 + ?字符
+        var reg = /^([-+]?(([1-9]\d*\.?\d*)|(0\.\d*[1-9]))[^\d\.]*)$/;
+        if (reg.test(this.props.value) && this.props.value !== prevProps.value) {
             var unit = this.getUnit();
             this.setState({ unit: unit });
         }
@@ -170,11 +173,19 @@ var NumberControl = /** @class */ (function (_super) {
         }
         this.input.focus();
     };
+    NumberControl.prototype.renderStatic = function (displayValue) {
+        if (displayValue === void 0) { displayValue = '-'; }
+        var _a = this.props, unit = _a.unit, value = _a.value;
+        var finalValue = unit && value && typeof value === 'string'
+            ? value.replace(unit, '')
+            : value;
+        return React__default["default"].createElement(React__default["default"].Fragment, null, finalValue || displayValue);
+    };
     NumberControl.prototype.render = function () {
         var _a;
         var _this = this;
         var _b;
-        var _c = this.props, className = _c.className, ns = _c.classPrefix, value = _c.value, step = _c.step, precision = _c.precision, max = _c.max, min = _c.min, disabled = _c.disabled, placeholder = _c.placeholder, showSteps = _c.showSteps, borderMode = _c.borderMode, suffix = _c.suffix, prefix = _c.prefix, kilobitSeparator = _c.kilobitSeparator, unitOptions = _c.unitOptions, readOnly = _c.readOnly, keyboard = _c.keyboard, displayMode = _c.displayMode, big = _c.big;
+        var _c = this.props, className = _c.className, ns = _c.classPrefix, value = _c.value, step = _c.step, precision = _c.precision, max = _c.max, min = _c.min, disabled = _c.disabled, placeholder = _c.placeholder, showSteps = _c.showSteps, borderMode = _c.borderMode, suffix = _c.suffix, prefix = _c.prefix, kilobitSeparator = _c.kilobitSeparator, unitOptions = _c.unitOptions, readOnly = _c.readOnly, keyboard = _c.keyboard, displayMode = _c.displayMode, big = _c.big, resetValue = _c.resetValue;
         var finalPrecision = this.filterNum(precision);
         var unit = (_b = this.state) === null || _b === void 0 ? void 0 : _b.unit;
         // 数据格式化
@@ -200,7 +211,7 @@ var NumberControl = /** @class */ (function (_super) {
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "NumberControl"), (_a = {},
                 _a["".concat(ns, "NumberControl--withUnit")] = unitOptions,
                 _a), className) },
-            React__default["default"].createElement(amisUi.NumberInput, { inputRef: this.inputRef, value: finalValue, step: step, max: this.filterNum(max), min: this.filterNum(min), formatter: formatter, parser: parser, onChange: this.handleChange, disabled: disabled, placeholder: placeholder, precision: finalPrecision, showSteps: showSteps, borderMode: borderMode, readOnly: readOnly, onFocus: function () { return _this.dispatchEvent('focus'); }, onBlur: function () { return _this.dispatchEvent('blur'); }, keyboard: keyboard, displayMode: displayMode, big: big }),
+            React__default["default"].createElement(amisUi.NumberInput, { inputRef: this.inputRef, value: finalValue, resetValue: resetValue, step: step, max: this.filterNum(max), min: this.filterNum(min), formatter: formatter, parser: parser, onChange: this.handleChange, disabled: disabled, placeholder: placeholder, precision: finalPrecision, showSteps: showSteps, borderMode: borderMode, readOnly: readOnly, onFocus: function () { return _this.dispatchEvent('focus'); }, onBlur: function () { return _this.dispatchEvent('blur'); }, keyboard: keyboard, displayMode: displayMode, big: big }),
             unitOptions ? (React__default["default"].createElement(amisUi.Select, { value: unit, clearable: false, options: this.state.unitOptions || [], onChange: this.handleChangeUnit })) : null));
     };
     NumberControl.defaultProps = {
@@ -219,6 +230,12 @@ var NumberControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], NumberControl.prototype, "inputRef", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], NumberControl.prototype, "render", null);
     return NumberControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/InputQuarterRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.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 QuarterRangeControl = /** @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: "quarters", 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)
+    ], QuarterRangeControl.prototype, "render", null);
     return QuarterRangeControl;
 }(InputDateRange["default"]));
 /** @class */ ((function (_super) {

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

@@ -1,7 +1,6 @@
 import React from 'react';
-import { FormControlProps } from 'amis-core';
+import { FormControlProps, ActionObject } from 'amis-core';
 import { FormBaseControlSchema, SchemaObject } from '../../Schema';
-import { ActionObject } from 'amis-core';
 /**
  * Range
  * 文档：https://baidu.gitee.io/amis/docs/components/form/range
@@ -211,7 +210,7 @@ export declare class Input extends React.Component<RangeItemProps, any> {
      * onChange事件，只能输入数字
      * @param e React.ChangeEvent
      */
-    onChange(value: number): void;
+    handleInputNumberChange(value: number): void;
     /**
      * 双滑块 更新value
      * @param value 输入的value值
@@ -255,7 +254,7 @@ export default class RangeControl extends React.PureComponent<RangeProps, RangeS
      * 所有触发value变换 -> onChange
      * @param value
      */
-    onChange(value: FormatValue): Promise<void>;
+    handleChange(value: FormatValue): Promise<void>;
     /**
      * 鼠标松开事件
      */

package/lib/renderers/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -15,6 +15,7 @@ var isEqual = require('lodash/isEqual');
 var forEach = require('lodash/forEach');
 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 }; }
 
@@ -66,11 +67,11 @@ var Input = /** @class */ (function (_super) {
      * onChange事件，只能输入数字
      * @param e React.ChangeEvent
      */
-    Input.prototype.onChange = function (value) {
+    Input.prototype.handleInputNumberChange = function (value) {
         var _a;
-        var _b = this.props, multiple = _b.multiple, originValue = _b.value, type = _b.type, min = _b.min;
+        var _b = this.props, multiple = _b.multiple, originValue = _b.value, type = _b.type, min = _b.min, onChange = _b.onChange;
         var _value = this.getValue(value, type);
-        this.props.onChange(multiple
+        onChange === null || onChange === void 0 ? void 0 : onChange(multiple
             ? tslib.__assign(tslib.__assign({}, originValue), (_a = {}, _a[type] = _value, _a)) : value !== null && value !== void 0 ? value : min);
     };
     /**
@@ -198,14 +199,14 @@ var Input = /** @class */ (function (_super) {
                 : Math.max(value.min, value.max)
             : value;
         return (React__default["default"].createElement("div", { className: cx("".concat(ns, "InputRange-input")) },
-            React__default["default"].createElement(amisUi.NumberInput, { value: +_value, step: step, max: this.checkNum(max), min: this.checkNum(min), onChange: this.onChange, disabled: disabled, onBlur: this.onBlur, onFocus: this.onFocus })));
+            React__default["default"].createElement(amisUi.NumberInput, { value: +_value, step: step, max: this.checkNum(max), min: this.checkNum(min), onChange: this.handleInputNumberChange, disabled: disabled, onBlur: this.onBlur, onFocus: this.onFocus })));
     };
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Number]),
         tslib.__metadata("design:returntype", void 0)
-    ], Input.prototype, "onChange", null);
+    ], Input.prototype, "handleInputNumberChange", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
@@ -289,7 +290,7 @@ var RangeControl = /** @class */ (function (_super) {
      * 所有触发value变换 -> onChange
      * @param value
      */
-    RangeControl.prototype.onChange = function (value) {
+    RangeControl.prototype.handleChange = function (value) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, onChange, dispatchEvent, result, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -338,7 +339,7 @@ var RangeControl = /** @class */ (function (_super) {
     RangeControl.prototype.render = function () {
         var _this = this;
         var value = this.state.value;
-        var props = tslib.__assign(tslib.__assign({}, this.props), { value: value, onChange: this.onChange, onAfterChange: this.onAfterChange });
+        var props = tslib.__assign(tslib.__assign({}, this.props), { value: value, onChange: this.handleChange, onAfterChange: this.onAfterChange });
         var ns = props.classPrefix, multiple = props.multiple; props.parts; var showInput = props.showInput, cx = props.classnames, className = props.className, disabled = props.disabled, clearable = props.clearable, min = props.min, max = props.max, render = props.render, marks = props.marks, region = props.region;
         // 处理自定义json配置
         var renderMarks = marks ? tslib.__assign({}, marks) : marks;
@@ -393,7 +394,7 @@ var RangeControl = /** @class */ (function (_super) {
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
-    ], RangeControl.prototype, "onChange", null);
+    ], RangeControl.prototype, "handleChange", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
@@ -406,6 +407,12 @@ var RangeControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], RangeControl.prototype, "getFormatValue", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], RangeControl.prototype, "render", null);
     return RangeControl;
 }(React__default["default"].PureComponent));
 /** @class */ ((function (_super) {

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.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,6 +51,11 @@ 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;
         return (React__default["default"].createElement("div", { className: cx('RatingControl', className) },
@@ -69,6 +75,12 @@ 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));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/InputRepeat.js

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

package/lib/renderers/Form/InputRichText.js

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

package/lib/renderers/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.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.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*/];
                 }
             });
         });
@@ -427,7 +434,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.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 +444,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 +473,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 +481,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 +489,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;
                 }
             });
         }
@@ -493,7 +500,7 @@ var FormTable = /** @class */ (function (_super) {
                     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) },
                         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,6 +639,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;
@@ -662,6 +676,7 @@ var FormTable = /** @class */ (function (_super) {
                 autoFillHeight: autoFillHeight,
                 tableContentClassName: tableContentClassName
             }, {
+                ref: this.tableRef.bind(this),
                 value: undefined,
                 saveImmediately: true,
                 disabled: disabled,

package/lib/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.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;