amis 2.8.0 → 2.9.0

package/lib/renderers/Form/InputColor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -232,6 +232,7 @@ interface DateControlState {
     }>;
 }
 export default class DateControl extends React.PureComponent<DateProps, DateControlState> {
+    placeholder: string;
     static defaultProps: {
         format: string;
         viewMode: string;
@@ -254,8 +255,8 @@ export default class DateControl extends React.PureComponent<DateProps, DateCont
     render(): JSX.Element;
 }
 export declare class DateControlRenderer extends DateControl {
+    placeholder: any;
     static defaultProps: {
-        placeholder: string;
         dateFormat: string;
         timeFormat: string;
         strictMode: boolean;
@@ -271,8 +272,8 @@ export declare class DateControlRenderer extends DateControl {
     };
 }
 export declare class DatetimeControlRenderer extends DateControl {
+    placeholder: any;
     static defaultProps: {
-        placeholder: string;
         inputFormat: string;
         dateFormat: string;
         timeFormat: string;
@@ -289,8 +290,8 @@ export declare class DatetimeControlRenderer extends DateControl {
     };
 }
 export declare class TimeControlRenderer extends DateControl {
+    placeholder: any;
     static defaultProps: {
-        placeholder: string;
         inputFormat: string;
         dateFormat: string;
         timeFormat: string;
@@ -306,8 +307,8 @@ export declare class TimeControlRenderer extends DateControl {
     };
 }
 export declare class MonthControlRenderer extends DateControl {
+    placeholder: any;
     static defaultProps: {
-        placeholder: string;
         inputFormat: string;
         dateFormat: string;
         timeFormat: string;
@@ -324,8 +325,8 @@ export declare class MonthControlRenderer extends DateControl {
     };
 }
 export declare class QuarterControlRenderer extends DateControl {
+    placeholder: any;
     static defaultProps: {
-        placeholder: string;
         inputFormat: string;
         dateFormat: string;
         timeFormat: string;
@@ -342,8 +343,8 @@ export declare class QuarterControlRenderer extends DateControl {
     };
 }
 export declare class YearControlRenderer extends DateControl {
+    placeholder: any;
     static defaultProps: {
-        placeholder: string;
         inputFormat: string;
         dateFormat: string;
         timeFormat: string;

package/lib/renderers/Form/InputDate.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -24,6 +24,7 @@ var DateControl = /** @class */ (function (_super) {
     tslib.__extends(DateControl, _super);
     function DateControl(props) {
         var _this = _super.call(this, props) || this;
+        _this.placeholder = '';
         var minDate = props.minDate, maxDate = props.maxDate, value = props.value, defaultValue = props.defaultValue, setPrinstineValue = props.setPrinstineValue, data = props.data, format = props.format, utc = props.utc;
         if (defaultValue && value === defaultValue) {
             var date = amisCore.filterDate(defaultValue, data, format);
@@ -140,7 +141,7 @@ var DateControl = /** @class */ (function (_super) {
         });
     };
     DateControl.prototype.render = function () {
-        var _a = this.props, className = _a.className; _a.style; _a.defaultValue; _a.defaultData; var cx = _a.classnames; _a.minDate; _a.maxDate; var type = _a.type, format = _a.format, timeFormat = _a.timeFormat, valueFormat = _a.valueFormat, env = _a.env, largeMode = _a.largeMode; _a.render; var useMobileUI = _a.useMobileUI, rest = tslib.__rest(_a, ["className", "style", "defaultValue", "defaultData", "classnames", "minDate", "maxDate", "type", "format", "timeFormat", "valueFormat", "env", "largeMode", "render", "useMobileUI"]);
+        var _a = this.props, className = _a.className; _a.style; _a.defaultValue; _a.defaultData; var cx = _a.classnames; _a.minDate; _a.maxDate; var type = _a.type, format = _a.format, timeFormat = _a.timeFormat, valueFormat = _a.valueFormat, env = _a.env, largeMode = _a.largeMode; _a.render; var useMobileUI = _a.useMobileUI, placeholder = _a.placeholder, rest = tslib.__rest(_a, ["className", "style", "defaultValue", "defaultData", "classnames", "minDate", "maxDate", "type", "format", "timeFormat", "valueFormat", "env", "largeMode", "render", "useMobileUI", "placeholder"]);
         var mobileUI = useMobileUI && amisCore.isMobile();
         if (type === 'time' && timeFormat) {
             format = timeFormat;
@@ -149,7 +150,7 @@ var DateControl = /** @class */ (function (_super) {
                 'is-date': /date$/.test(type),
                 'is-datetime': /datetime$/.test(type)
             }, className) },
-            React__default["default"].createElement(amisUi.DatePicker, tslib.__assign({}, rest, { useMobileUI: useMobileUI, popOverContainer: mobileUI && env && env.getModalContainer
+            React__default["default"].createElement(amisUi.DatePicker, tslib.__assign({}, rest, { placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : this.placeholder, useMobileUI: useMobileUI, popOverContainer: mobileUI && env && env.getModalContainer
                     ? env.getModalContainer
                     : mobileUI
                         ? undefined
@@ -195,9 +196,11 @@ var DateControl = /** @class */ (function (_super) {
 var DateControlRenderer = /** @class */ (function (_super) {
     tslib.__extends(DateControlRenderer, _super);
     function DateControlRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.placeholder = _this.props.translate('Date.placeholder');
+        return _this;
     }
-    DateControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { placeholder: 'Date.placeholder', dateFormat: 'YYYY-MM-DD', timeFormat: '', strictMode: false });
+    DateControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { dateFormat: 'YYYY-MM-DD', timeFormat: '', strictMode: false });
     DateControlRenderer = tslib.__decorate([
         amisCore.FormItem({
             type: 'input-date',
@@ -209,9 +212,11 @@ var DateControlRenderer = /** @class */ (function (_super) {
 /** @class */ ((function (_super) {
     tslib.__extends(DatetimeControlRenderer, _super);
     function DatetimeControlRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.placeholder = _this.props.translate('DateTime.placeholder');
+        return _this;
     }
-    DatetimeControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { placeholder: 'DateTime.placeholder', inputFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'LL', timeFormat: 'HH:mm:ss', closeOnSelect: false, strictMode: false });
+    DatetimeControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { inputFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'LL', timeFormat: 'HH:mm:ss', closeOnSelect: false, strictMode: false });
     DatetimeControlRenderer = tslib.__decorate([
         amisCore.FormItem({
             type: 'input-datetime'
@@ -222,9 +227,11 @@ var DateControlRenderer = /** @class */ (function (_super) {
 /** @class */ ((function (_super) {
     tslib.__extends(TimeControlRenderer, _super);
     function TimeControlRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.placeholder = _this.props.translate('Time.placeholder');
+        return _this;
     }
-    TimeControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { placeholder: 'Time.placeholder', inputFormat: 'HH:mm', dateFormat: '', timeFormat: 'HH:mm', viewMode: 'time', closeOnSelect: false });
+    TimeControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { inputFormat: 'HH:mm', dateFormat: '', timeFormat: 'HH:mm', viewMode: 'time', closeOnSelect: false });
     TimeControlRenderer = tslib.__decorate([
         amisCore.FormItem({
             type: 'input-time'
@@ -235,9 +242,11 @@ var DateControlRenderer = /** @class */ (function (_super) {
 /** @class */ ((function (_super) {
     tslib.__extends(MonthControlRenderer, _super);
     function MonthControlRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.placeholder = _this.props.translate('Month.placeholder');
+        return _this;
     }
-    MonthControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { placeholder: 'Month.placeholder', inputFormat: 'YYYY-MM', dateFormat: 'MM', timeFormat: '', viewMode: 'months', closeOnSelect: true, strictMode: false });
+    MonthControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { inputFormat: 'YYYY-MM', dateFormat: 'MM', timeFormat: '', viewMode: 'months', closeOnSelect: true, strictMode: false });
     MonthControlRenderer = tslib.__decorate([
         amisCore.FormItem({
             type: 'input-month'
@@ -248,9 +257,11 @@ var DateControlRenderer = /** @class */ (function (_super) {
 /** @class */ ((function (_super) {
     tslib.__extends(QuarterControlRenderer, _super);
     function QuarterControlRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.placeholder = _this.props.translate('Quarter.placeholder');
+        return _this;
     }
-    QuarterControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { placeholder: 'Quarter.placeholder', inputFormat: 'YYYY [Q]Q', dateFormat: 'YYYY [Q]Q', timeFormat: '', viewMode: 'quarters', closeOnSelect: true, strictMode: false });
+    QuarterControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { inputFormat: 'YYYY [Q]Q', dateFormat: 'YYYY [Q]Q', timeFormat: '', viewMode: 'quarters', closeOnSelect: true, strictMode: false });
     QuarterControlRenderer = tslib.__decorate([
         amisCore.FormItem({
             type: 'input-quarter'
@@ -261,9 +272,11 @@ var DateControlRenderer = /** @class */ (function (_super) {
 /** @class */ ((function (_super) {
     tslib.__extends(YearControlRenderer, _super);
     function YearControlRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.placeholder = _this.props.translate('Year.placeholder');
+        return _this;
     }
-    YearControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { placeholder: 'Year.placeholder', inputFormat: 'YYYY', dateFormat: 'YYYY', timeFormat: '', viewMode: 'years', closeOnSelect: true, strictMode: false });
+    YearControlRenderer.defaultProps = tslib.__assign(tslib.__assign({}, DateControl.defaultProps), { inputFormat: 'YYYY', dateFormat: 'YYYY', timeFormat: '', viewMode: 'years', closeOnSelect: true, strictMode: false });
     YearControlRenderer = tslib.__decorate([
         amisCore.FormItem({
             type: 'input-year'

package/lib/renderers/Form/InputDateRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -33,6 +33,10 @@ export interface InputExcelControlSchema extends FormBaseControlSchema {
     parseImage?: boolean;
     /** 图片解析结果使用 data URI 格式 */
     imageDataURI?: boolean;
+    /**
+     * 占位文本提示
+     */
+    placeholder?: string;
 }
 export interface ExcelProps extends FormControlProps, Omit<InputExcelControlSchema, 'type' | 'className' | 'descriptionClassName' | 'inputClassName'> {
 }

package/lib/renderers/Form/InputExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -273,7 +273,7 @@ var ExcelControl = /** @class */ (function (_super) {
     };
     ExcelControl.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className; _a.style; var cx = _a.classnames; _a.classPrefix; _a.value; var disabled = _a.disabled, __ = _a.translate;
+        var _a = this.props, className = _a.className, cx = _a.classnames; _a.classPrefix; var disabled = _a.disabled, __ = _a.translate, placeholder = _a.placeholder;
         return (React__default["default"].createElement("div", { className: cx('ExcelControl', className) },
             React__default["default"].createElement(DropZone__default["default"], { key: "drop-zone", onDrop: this.handleDrop, accept: ".xlsx", multiple: false, disabled: disabled }, function (_a) {
                 var getRootProps = _a.getRootProps, getInputProps = _a.getInputProps;
@@ -282,7 +282,7 @@ var ExcelControl = /** @class */ (function (_super) {
                         React__default["default"].createElement("input", tslib.__assign({}, getInputProps())),
                         _this.state.filename ? (__('Excel.parsed', {
                             filename: _this.state.filename
-                        })) : (React__default["default"].createElement("p", null, __('Excel.placeholder'))))));
+                        })) : (React__default["default"].createElement("p", null, placeholder !== null && placeholder !== void 0 ? placeholder : __('Excel.placeholder'))))));
             })));
     };
     ExcelControl.defaultProps = {

package/lib/renderers/Form/InputFile.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputFormula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -249,6 +249,7 @@ export default class ImageControl extends React.Component<ImageProps, ImageState
         receiver: string;
         hideUploadButton: boolean;
         placeholder: string;
+        placeholderPlacement: string;
         joinValues: boolean;
         extractValue: boolean;
         delimiter: string;

package/lib/renderers/Form/InputImage.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -832,7 +832,7 @@ var ImageControl = /** @class */ (function (_super) {
     };
     ImageControl.prototype.render = function () {
         var _this_1 = this;
-        var _a = this.props, className = _a.className; _a.style; var cx = _a.classnames, placeholder = _a.placeholder, disabled = _a.disabled, multiple = _a.multiple, accept = _a.accept, maxLength = _a.maxLength, autoUpload = _a.autoUpload, hideUploadButton = _a.hideUploadButton, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, reCropable = _a.reCropable, frameImage = _a.frameImage, fixedSize = _a.fixedSize, fixedSizeClassName = _a.fixedSizeClassName, __ = _a.translate;
+        var _a = this.props, className = _a.className; _a.style; var cx = _a.classnames, placeholder = _a.placeholder, placeholderPlacement = _a.placeholderPlacement, disabled = _a.disabled, multiple = _a.multiple, accept = _a.accept, maxLength = _a.maxLength, autoUpload = _a.autoUpload, hideUploadButton = _a.hideUploadButton, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, reCropable = _a.reCropable, frameImage = _a.frameImage, fixedSize = _a.fixedSize, fixedSizeClassName = _a.fixedSizeClassName, __ = _a.translate;
         var _b = this.state, files = _b.files, error = _b.error, crop = _b.crop, uploading = _b.uploading, cropFile = _b.cropFile, frameImageWidth = _b.frameImageWidth;
         var frameImageStyle = {};
         if (fixedSizeClassName && frameImageWidth && fixedSize) {
@@ -910,7 +910,7 @@ var ImageControl = /** @class */ (function (_super) {
                     (multiple && (!maxLength || files.length < maxLength)) ||
                         (!multiple && !files.length) ? (React__default["default"].createElement("label", { className: cx('ImageControl-addBtn', {
                             'is-disabled': disabled
-                        }, fixedSize ? 'ImageControl-fixed-size' : '', fixedSize ? fixedSizeClassName : ''), style: frameImageStyle, onClick: _this_1.handleSelect, "data-tooltip": __(placeholder), "data-position": "right", ref: _this_1.frameImageRef },
+                        }, fixedSize ? 'ImageControl-fixed-size' : '', fixedSize ? fixedSizeClassName : ''), style: frameImageStyle, onClick: _this_1.handleSelect, "data-tooltip": __(placeholder), "data-position": placeholderPlacement, ref: _this_1.frameImageRef },
                         filterFrameImage ? (React__default["default"].createElement(Image$1["default"], { key: "upload-default-image", src: filterFrameImage, className: cx(fixedSize ? 'Image-thumb--fixed-size' : ''), onLoad: _this_1.handleFrameImageLoaded.bind(_this_1), thumbMode: thumbMode, thumbRatio: thumbRatio })) : (React__default["default"].createElement(React__default["default"].Fragment, null,
                             React__default["default"].createElement(amisUi.Icon, { icon: "plus-fine", className: "icon" }),
                             React__default["default"].createElement("span", { className: cx('ImageControl-addBtn-text') }, __('Image.upload')))),
@@ -925,6 +925,7 @@ var ImageControl = /** @class */ (function (_super) {
         receiver: '/api/upload',
         hideUploadButton: false,
         placeholder: 'Image.placeholder',
+        placeholderPlacement: 'top',
         joinValues: true,
         extractValue: false,
         delimiter: ',',

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import InputDateRange, { DateRangeControlSchema } from './InputDateRange';
 /**
  * MonthRange 月范围控件

package/lib/renderers/Form/InputMonthRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -238,7 +238,9 @@ var NumberControl = /** @class */ (function (_super) {
                 _a["".concat(ns, "NumberControl--withUnit")] = unitOptions,
                 _a), className) },
             React__default["default"].createElement(amisUi.NumberInput, { inputRef: this.inputRef, value: finalValue, resetValue: resetValue, step: step, max: this.filterNum(max, big), min: this.filterNum(min, big), 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, clearValueOnEmpty: clearValueOnEmpty }),
-            unitOptions ? (React__default["default"].createElement(amisUi.Select, { value: unit, clearable: false, options: this.state.unitOptions || [], onChange: this.handleChangeUnit })) : null));
+            unitOptions ? (unitOptions.length > 1 ? (React__default["default"].createElement(amisUi.Select, { value: unit, clearable: false, options: this.state.unitOptions || [], onChange: this.handleChangeUnit, className: "".concat(ns, "NumberControl-unit") })) : (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "NumberControl-unit"), " ".concat(ns, "NumberControl-single-unit"), "".concat(ns, "Select")) }, typeof unitOptions[0] === 'string'
+                ? unitOptions[0]
+                : unitOptions[0].label))) : null));
     };
     NumberControl.defaultProps = {
         step: 1,

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import InputDateRange, { DateRangeControlSchema } from './InputDateRange';
 /**
  * QuarterRange 季度范围控件

package/lib/renderers/Form/InputQuarterRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputRating.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputRepeat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputRichText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -204,6 +204,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
     removeEntry(entry: any): void;
     getEntryId(entry: any): string;
     tableRef(ref: any): void;
+    computedAddBtnDisabled(): boolean;
     render(): JSX.Element | null;
 }
 export declare class TableControlRenderer extends FormTable {

package/lib/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -19,6 +19,7 @@ var inRange = require('lodash/inRange');
 var find = require('lodash/find');
 var moment = require('moment');
 var merge = require('lodash/merge');
+var mergeWith = require('lodash/mergeWith');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -31,6 +32,7 @@ var inRange__default = /*#__PURE__*/_interopDefaultLegacy(inRange);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
+var mergeWith__default = /*#__PURE__*/_interopDefaultLegacy(mergeWith);
 
 var FormTable = /** @class */ (function (_super) {
     tslib.__extends(FormTable, _super);
@@ -62,10 +64,9 @@ var FormTable = /** @class */ (function (_super) {
         var toUpdate = null;
         // 如果static为true 或 disabled为true，
         // 则删掉正在新增 或 编辑的那一行
-        var items = [];
-        if (props.static !== nextProps.static
-            || props.disabled !== nextProps.disabled) {
-            items = this.state.items.filter(function (item) { return !item.__isPlaceholder; });
+        if (props.$schema.disabled !== nextProps.$schema.disabled
+            || props.$schema.static !== nextProps.$schema.static) {
+            var items = this.state.items.filter(function (item) { return !item.__isPlaceholder; });
             toUpdate = tslib.__assign(tslib.__assign({}, toUpdate), { items: items, editIndex: -1, columns: this.buildColumns(props) });
         }
         if (props.columns !== nextProps.columns) {
@@ -341,7 +342,7 @@ var FormTable = /** @class */ (function (_super) {
     FormTable.prototype.confirmEdit = function () {
         var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _c, addApi, updateApi, data, env, __, subForms, items, item, isNew, remote, apiMsg;
+            var _c, addApi, updateApi, data, env, __, subForms, validateForms, results, items, item, isNew, remote, apiMsg;
             var _this = this;
             return tslib.__generator(this, function (_d) {
                 switch (_d.label) {
@@ -350,25 +351,40 @@ var FormTable = /** @class */ (function (_super) {
                         subForms = [];
                         Object.keys(this.subForms).forEach(function (key) { return _this.subForms[key] && subForms.push(_this.subForms[key]); });
                         subForms.forEach(function (form) { return form.flush(); });
+                        validateForms = [];
+                        Object.keys(this.subForms).forEach(function (key) {
+                            var arr = key.split('-');
+                            var num = +arr[1];
+                            if (num === _this.state.editIndex && _this.subForms[key]) {
+                                validateForms.push(_this.subForms[key]);
+                            }
+                        });
+                        return [4 /*yield*/, Promise.all(validateForms.map(function (item) { return item.validate(); }))];
+                    case 1:
+                        results = _d.sent();
+                        // 有校验不通过的
+                        if (~results.indexOf(false)) {
+                            return [2 /*return*/];
+                        }
                         items = this.state.items.concat();
                         item = tslib.__assign({}, items[this.state.editIndex]);
                         isNew = item.__isPlaceholder;
                         remote = null;
                         apiMsg = undefined;
-                        if (!(isNew && amisCore.isEffectiveApi(addApi, amisCore.createObject(data, item)))) return [3 /*break*/, 2];
+                        if (!(isNew && amisCore.isEffectiveApi(addApi, amisCore.createObject(data, item)))) return [3 /*break*/, 3];
                         return [4 /*yield*/, env.fetcher(addApi, amisCore.createObject(data, item))];
-                    case 1:
+                    case 2:
                         remote = _d.sent();
                         apiMsg = (_a = addApi === null || addApi === void 0 ? void 0 : addApi.messages) === null || _a === void 0 ? void 0 : _a.failed;
-                        return [3 /*break*/, 4];
-                    case 2:
-                        if (!amisCore.isEffectiveApi(updateApi, amisCore.createObject(data, item))) return [3 /*break*/, 4];
-                        return [4 /*yield*/, env.fetcher(updateApi, amisCore.createObject(data, item))];
+                        return [3 /*break*/, 5];
                     case 3:
+                        if (!amisCore.isEffectiveApi(updateApi, amisCore.createObject(data, item))) return [3 /*break*/, 5];
+                        return [4 /*yield*/, env.fetcher(updateApi, amisCore.createObject(data, item))];
+                    case 4:
                         remote = _d.sent();
                         apiMsg = (_b = updateApi === null || updateApi === void 0 ? void 0 : updateApi.messages) === null || _b === void 0 ? void 0 : _b.failed;
-                        _d.label = 4;
-                    case 4:
+                        _d.label = 5;
+                    case 5:
                         if (remote && !remote.ok) {
                             env.notify('error', apiMsg !== null && apiMsg !== void 0 ? apiMsg : (remote.msg || __('saveFailed')));
                             return [2 /*return*/];
@@ -515,9 +531,10 @@ var FormTable = /** @class */ (function (_super) {
                 var quickEdit = !isCreateMode && column.hasOwnProperty('quickEditOnUpdate')
                     ? column.quickEditOnUpdate
                     : column.quickEdit;
+                var render = amisCore.getRendererByName(column === null || column === void 0 ? void 0 : column.type);
                 return quickEdit === false
                     ? omit__default["default"](column, ['quickEdit'])
-                    : tslib.__assign(tslib.__assign({}, column), { quickEdit: tslib.__assign(tslib.__assign(tslib.__assign({}, _this.columnToQuickEdit(column)), quickEdit), { saveImmediately: true, mode: 'inline', disabled: disabled }) });
+                    : tslib.__assign(tslib.__assign({}, column), { quickEdit: tslib.__assign(tslib.__assign(tslib.__assign({}, _this.columnToQuickEdit(column)), quickEdit), { isQuickEditFormMode: !!(render === null || render === void 0 ? void 0 : render.isFormItem), saveImmediately: true, mode: 'inline', disabled: disabled }) });
             });
             !isStatic && props.editable &&
                 btns.push({
@@ -547,6 +564,15 @@ var FormTable = /** @class */ (function (_super) {
                 }
             });
         }
+        else {
+            columns = columns.map(function (column) {
+                var render = amisCore.getRendererByName(column === null || column === void 0 ? void 0 : column.type);
+                if (!!(render === null || render === void 0 ? void 0 : render.isFormItem)) {
+                    return tslib.__assign(tslib.__assign({}, column), { quickEdit: tslib.__assign(tslib.__assign({}, column), { isFormMode: true }) });
+                }
+                return column;
+            });
+        }
         if (!isStatic && props.removable) {
             btns.push({
                 children: function (_a) {
@@ -601,6 +627,7 @@ var FormTable = /** @class */ (function (_super) {
         return quickEdit;
     };
     FormTable.prototype.handleTableSave = function (rows, diff, rowIndexes) {
+        var _a;
         var perPage = this.props.perPage;
         if (~this.state.editIndex) {
             var items_3 = this.state.items.concat();
@@ -638,7 +665,23 @@ var FormTable = /** @class */ (function (_super) {
                 indexes[0] += (page - 1) * perPage;
             }
             var origin_2 = amisCore.getTree(items, indexes);
-            var data = merge__default["default"]({}, origin_2, diff);
+            var comboNames_1 = [];
+            ((_a = this.props.$schema.columns) !== null && _a !== void 0 ? _a : []).forEach(function (e) {
+                if (e.type === 'combo' && !Array.isArray(diff)) {
+                    comboNames_1.push(e.name);
+                }
+            });
+            var data = mergeWith__default["default"]({}, origin_2, diff, function (objValue, srcValue, key, object, source, stack) {
+                // 只对第一层做处理，如果不是combo，并且是数组，直接采用diff的值
+                if (stack.size === 0
+                    && comboNames_1.indexOf(key) === -1
+                    && Array.isArray(objValue)
+                    && Array.isArray(srcValue)) {
+                    return srcValue;
+                }
+                // 直接return，默认走的mergeWith自身的merge
+                return;
+            });
             items = amisCore.spliceTree(items, indexes, 1, data);
             this.entries.set(data, this.entries.get(origin_2) || this.entityId++);
             // this.entries.delete(origin); // 反正最后都会清理的，先不删了吧。
@@ -701,6 +744,13 @@ var FormTable = /** @class */ (function (_super) {
         }
         this.tableStore = (_a = ref === null || ref === void 0 ? void 0 : ref.props) === null || _a === void 0 ? void 0 : _a.store;
     };
+    FormTable.prototype.computedAddBtnDisabled = function () {
+        var disabled = this.props.disabled;
+        if (disabled !== undefined) {
+            return disabled;
+        }
+        return !!~this.state.editIndex;
+    };
     FormTable.prototype.render = function () {
         var _this = this;
         var _a, _b;
@@ -720,14 +770,8 @@ var FormTable = /** @class */ (function (_super) {
             showPager = true;
             offset = (page - 1) * perPage;
         }
-        var footerAddBtnSchema = {
-            type: 'button',
-            level: 'primary',
-            size: 'sm',
-            label: '新增',
-            icon: 'fa fa-plus',
-            disabled: disabled
-        };
+        var footerAddBtnDisabled = this.computedAddBtnDisabled();
+        var footerAddBtnSchema = tslib.__assign({ type: 'button', level: 'primary', size: 'sm', label: __('Table.add'), icon: 'fa fa-plus', disabled: footerAddBtnDisabled }, (footerAddBtnDisabled ? { disabledTip: __('Table.addButtonDisabledTip') } : {}));
         if (footerAddBtn !== undefined) {
             footerAddBtnSchema = Object.assign(footerAddBtnSchema, footerAddBtn);
         }

package/lib/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import InputDateRange, { DateRangeControlSchema } from './InputDateRange';
 /**
  * YearRange 年份范围控件

package/lib/renderers/Form/InputYearRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/JSONSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/JSONSchemaEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */