amis 2.7.3-beta.0 → 2.9.0

package/lib/renderers/Form/InputNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -52,18 +52,19 @@ 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, min = _a.min, max = _a.max, precision = _a.precision, step = _a.step, resetValue = _a.resetValue, big = _a.big, 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, clearValueOnEmpty = _a.clearValueOnEmpty;
         if (actionType === 'clear') {
-            onChange === null || onChange === void 0 ? void 0 : onChange('');
+            onChange === null || onChange === void 0 ? void 0 : onChange(clearValueOnEmpty ? undefined : '');
         }
         else if (actionType === 'reset') {
             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, big), this.filterNum(max, big), finalPrecision, resetValue !== null && resetValue !== void 0 ? resetValue : '', big);
-            onChange === null || onChange === void 0 ? void 0 : onChange(value);
+            var value = amisUi.NumberInput.normalizeValue(resetValue !== null && resetValue !== void 0 ? resetValue : '', this.filterNum(min, big), this.filterNum(max, big), finalPrecision, resetValue !== null && resetValue !== void 0 ? resetValue : '', clearValueOnEmpty, big);
+            onChange === null || onChange === void 0 ? void 0 : onChange(clearValueOnEmpty && value === '' ? undefined : value);
         }
     };
     // 解析出单位
     NumberControl.prototype.getUnit = function () {
+        var e_1, _a;
         var props = this.props;
         if (props.unitOptions && props.unitOptions.length) {
             var optionValues = amisCore.normalizeOptions(props.unitOptions).map(function (option) { return option.value; });
@@ -72,12 +73,21 @@ var NumberControl = /** @class */ (function (_super) {
                 var unit = optionValues[0];
                 // 先找长的字符，这样如果有 ab 和 b 两种后缀相同的也能识别
                 optionValues.sort(function (a, b) { return b.length - a.length; });
-                for (var _i = 0, optionValues_1 = optionValues; _i < optionValues_1.length; _i++) {
-                    var optionValue = optionValues_1[_i];
-                    if (props.value.endsWith(optionValue)) {
-                        unit = optionValue;
-                        break;
+                try {
+                    for (var optionValues_1 = tslib.__values(optionValues), optionValues_1_1 = optionValues_1.next(); !optionValues_1_1.done; optionValues_1_1 = optionValues_1.next()) {
+                        var optionValue = optionValues_1_1.value;
+                        if (props.value.endsWith(optionValue)) {
+                            unit = optionValue;
+                            break;
+                        }
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (optionValues_1_1 && !optionValues_1_1.done && (_a = optionValues_1.return)) _a.call(optionValues_1);
                     }
+                    finally { if (e_1) throw e_1.error; }
                 }
                 return unit;
             }
@@ -113,19 +123,20 @@ var NumberControl = /** @class */ (function (_super) {
     };
     NumberControl.prototype.handleChange = function (inputValue) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, dispatchEvent, value, rendererEvent;
+            var _a, onChange, dispatchEvent, clearValueOnEmpty, value, resultValue, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent, clearValueOnEmpty = _a.clearValueOnEmpty;
                         value = this.getValue(inputValue);
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
+                        resultValue = clearValueOnEmpty && value === '' ? undefined : value;
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: resultValue }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
-                        onChange(value);
+                        onChange(resultValue);
                         return [2 /*return*/];
                 }
             });
@@ -200,7 +211,7 @@ var NumberControl = /** @class */ (function (_super) {
         var _a;
         var _this = this;
         var _b;
-        var _c = this.props, className = _c.className; _c.style; var 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 _c = this.props, className = _c.className; _c.style; var 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, clearValueOnEmpty = _c.clearValueOnEmpty;
         var finalPrecision = this.filterNum(precision);
         var unit = (_b = this.state) === null || _b === void 0 ? void 0 : _b.unit;
         // 数据格式化
@@ -226,12 +237,15 @@ 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, 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 }),
-            unitOptions ? (React__default["default"].createElement(amisUi.Select, { value: unit, clearable: false, options: this.state.unitOptions || [], onChange: this.handleChangeUnit })) : null));
+            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 ? (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,
-        resetValue: ''
+        resetValue: '',
+        clearValueOnEmpty: false
     };
     tslib.__decorate([
         amisCore.autobind,

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.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -32,16 +32,16 @@ var forEach__default = /*#__PURE__*/_interopDefaultLegacy(forEach);
  * @returns number | {min: number, max: number}
  */
 function formatValue(value, props) {
-    var _a;
+    var _a, _b;
     if (props.multiple) {
         var min = props.min, max = props.max;
         // value是字符串
         if (typeof value === 'string') {
-            _a = value.split(props.delimiter || ',').map(function (v) { return Number(v); }), min = _a[0], max = _a[1];
+            _a = tslib.__read(value.split(props.delimiter || ',').map(function (v) { return Number(v); }), 2), min = _a[0], max = _a[1];
         }
         // value是数组
         else if (Array.isArray(value)) {
-            min = value[0], max = value[1];
+            _b = tslib.__read(value, 2), min = _b[0], max = _b[1];
         }
         // value是对象
         else if (typeof value === 'object') {

package/lib/renderers/Form/InputRating.js

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

package/lib/renderers/Form/InputRepeat.js

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

package/lib/renderers/Form/InputRichText.js

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

package/lib/renderers/Form/InputSubForm.js

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

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormControlProps, FormBaseControl, SimpleMap, RendererData, ActionObject, ITableStore } from 'amis-core';
 import { TableSchema } from '../Table';
-import { SchemaApi } from '../../Schema';
+import { SchemaApi, SchemaCollection } from '../../Schema';
 import type { SchemaTokenizeableString } from '../../Schema';
 export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, 'type'> {
     type: 'input-table';
@@ -41,10 +41,6 @@ export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, '
      * 新增按钮图标
      */
     addBtnIcon?: string;
-    /**
-     * 显示新增按钮
-     */
-    showAddBtn?: boolean;
     /**
      * 可否删除
      */
@@ -129,6 +125,18 @@ export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, '
      * 限制最小个数
      */
     minLength?: number | SchemaTokenizeableString;
+    /**
+     * 是否显示底部新增按钮
+     */
+    showFooterAddBtn?: boolean;
+    /**
+     * 是否显示表格操作栏新增按钮
+     */
+    showTableAddBtn?: boolean;
+    /**
+     * 底部新增按钮配置
+     */
+    footerAddBtn?: SchemaCollection;
 }
 export interface TableProps extends FormControlProps, Omit<TableControlSchema, 'type' | 'className' | 'descriptionClassName' | 'inputClassName'> {
 }
@@ -153,6 +161,8 @@ export default class FormTable extends React.Component<TableProps, TableState> {
         valueField: string;
         minLength: number;
         maxLength: number;
+        showFooterAddBtn: boolean;
+        showTableAddBtn: boolean;
     };
     static propsList: Array<string>;
     entries: SimpleMap<any, number>;
@@ -194,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.7.3-beta.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);
@@ -60,6 +62,13 @@ var FormTable = /** @class */ (function (_super) {
     FormTable.prototype.componentDidUpdate = function (nextProps) {
         var props = this.props;
         var toUpdate = null;
+        // 如果static为true 或 disabled为true，
+        // 则删掉正在新增 或 编辑的那一行
+        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) {
             toUpdate = tslib.__assign(tslib.__assign({}, toUpdate), { columns: this.buildColumns(props) });
         }
@@ -245,7 +254,7 @@ var FormTable = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         _d.label = 7;
-                    case 7: return [2 /*return*/, onAction && onAction.apply(void 0, tslib.__spreadArray([action, ctx], rest, false))];
+                    case 7: return [2 /*return*/, onAction && onAction.apply(void 0, tslib.__spreadArray([action, ctx], tslib.__read(rest), false))];
                 }
             });
         });
@@ -254,7 +263,13 @@ var FormTable = /** @class */ (function (_super) {
         var _this = this;
         var needConfirm = this.props.needConfirm;
         var items = this.state.items.concat();
-        items.splice(index + 1, 0, items[index]);
+        if (needConfirm === false) {
+            items.splice(index + 1, 0, items[index]);
+        }
+        else {
+            // 复制相当于新增一行，需要同addItem一致添加__placeholder属性
+            items.splice(index + 1, 0, tslib.__assign(tslib.__assign({}, items[index]), { __isPlaceholder: true }));
+        }
         index = Math.min(index + 1, items.length - 1);
         this.setState({
             items: items
@@ -327,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) {
@@ -336,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*/];
@@ -463,25 +493,28 @@ var FormTable = /** @class */ (function (_super) {
         var showIndex = this.props.showIndex;
         var minLength = this.resolveVariableProps(this.props, 'minLength');
         var maxLength = this.resolveVariableProps(this.props, 'maxLength');
+        var isStatic = this.props.static;
+        var disabled = this.props.disabled;
+        this.props.showTableAddBtn;
         var btns = [];
-        if (props.addable && props.showAddBtn !== false) {
+        if (!isStatic && props.addable && props.showTableAddBtn !== false) {
             btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
                     return (~_this.state.editIndex && needConfirm !== false) ||
-                        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 ? (typeof props.addBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.addBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.addBtnIcon))) : null));
+                        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, disabled: disabled, onClick: _this.addItem.bind(_this, rowIndex + offset, undefined) },
+                        props.addBtnIcon ? (typeof props.addBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.addBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.addBtnIcon))) : null,
+                        props.addBtnLabel ? React__default["default"].createElement("span", null, props.addBtnLabel) : null));
                 }
             });
         }
-        if (props.copyable && props.showCopyBtn !== false) {
+        if (!isStatic && props.copyable && props.showCopyBtn !== false) {
             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.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 ? (typeof props.copyBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.copyBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.copyBtnIcon))) : null));
+                    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, disabled: disabled, onClick: _this.copyItem.bind(_this, rowIndex + offset, undefined) },
+                        props.copyBtnIcon ? (typeof props.copyBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.copyBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.copyBtnIcon))) : null,
+                        props.copyBtnLabel ? React__default["default"].createElement("span", null, props.copyBtnLabel) : null));
                 }
             });
         }
@@ -490,7 +523,7 @@ var FormTable = /** @class */ (function (_super) {
                 var quickEdit = column.quickEdit;
                 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' }) });
+                    : tslib.__assign(tslib.__assign({}, column), { quickEdit: tslib.__assign(tslib.__assign(tslib.__assign({}, _this.columnToQuickEdit(column)), quickEdit), { saveImmediately: true, mode: 'inline', disabled: disabled, static: isStatic }) });
             });
         }
         else if (props.addable || props.editable || isCreateMode) {
@@ -498,47 +531,57 @@ 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' }) });
+                    : 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 }) });
             });
-            props.editable &&
+            !isStatic && props.editable &&
                 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) ? null : (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.editRow'), tooltipContainer: env && env.getModalContainer
                                 ? 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 ? (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));
+                                : undefined, disabled: disabled, onClick: function () { return _this.startEdit(rowIndex + offset); } },
+                            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,
+                            props.updateBtnLabel || props.editBtnLabel ? (React__default["default"].createElement("span", null, props.updateBtnLabel || props.editBtnLabel)) : null));
                     }
                 });
-            btns.push({
+            !isStatic && btns.push({
                 children: function (_a) {
                     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 ? (typeof props.confirmBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.confirmBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.confirmBtnIcon))) : 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,
+                        props.confirmBtnLabel ? (React__default["default"].createElement("span", null, props.confirmBtnLabel)) : null)) : null;
                 }
             });
-            btns.push({
+            !isStatic && btns.push({
                 children: function (_a) {
                     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 ? (typeof props.cancelBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.cancelBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.cancelBtnIcon))) : 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,
+                        props.cancelBtnLabel ? (React__default["default"].createElement("span", null, props.cancelBtnLabel)) : null)) : null;
                 }
             });
         }
-        if (props.removable) {
+        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) {
                     var key = _a.key, rowIndex = _a.rowIndex, data = _a.data, offset = _a.offset;
                     return ((~_this.state.editIndex || (data && data.__isPlaceholder)) &&
                         needConfirm !== false) ||
-                        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 ? (typeof props.deleteBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.deleteBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.deleteBtnIcon))) : null));
+                        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, disabled: disabled, onClick: _this.removeItem.bind(_this, rowIndex + offset) },
+                        props.deleteBtnIcon ? (typeof props.deleteBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.deleteBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.deleteBtnIcon))) : null,
+                        props.deleteBtnLabel ? (React__default["default"].createElement("span", null, props.deleteBtnLabel)) : null));
                 }
             });
         }
@@ -584,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();
@@ -621,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); // 反正最后都会清理的，先不删了吧。
@@ -684,10 +744,17 @@ 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;
-        var _c = this.props, className = _c.className; _c.style; _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.style; _c.value; var 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, isStatic = _c.static, showFooterAddBtn = _c.showFooterAddBtn; _c.showTableAddBtn; var footerAddBtn = _c.footerAddBtn;
         var maxLength = this.resolveVariableProps(this.props, 'maxLength');
         if (formInited === false) {
             return null;
@@ -703,6 +770,11 @@ var FormTable = /** @class */ (function (_super) {
             showPager = true;
             offset = (page - 1) * perPage;
         }
+        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);
+        }
         return (React__default["default"].createElement("div", { className: cx('InputTable', className) },
             render('body', {
                 type: 'table',
@@ -738,13 +810,13 @@ var FormTable = /** @class */ (function (_super) {
                 // TODO: 这里是为了处理columns里使用value变量添加的，目前会影响初始化数据加载后的组件行为，先回滚
                 // onPristineChange: this.handlePristineChange
             }),
-            (addable &&
-                showAddBtn !== false &&
+            (!isStatic && addable &&
+                showFooterAddBtn !== 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,
+                addable && showFooterAddBtn !== false ? (render('button', footerAddBtnSchema, {
+                    onClick: function () { return _this.addItem(_this.state.items.length); }
+                })) : null,
                 showPager
                     ? render('pager', {
                         type: 'pagination'
@@ -767,7 +839,9 @@ var FormTable = /** @class */ (function (_super) {
         cancelBtnIcon: 'close',
         valueField: '',
         minLength: 0,
-        maxLength: Infinity
+        maxLength: Infinity,
+        showFooterAddBtn: true,
+        showTableAddBtn: true
     };
     FormTable.propsList = [
         'onChange',
@@ -775,7 +849,7 @@ var FormTable = /** @class */ (function (_super) {
         'columns',
         'label',
         'scaffold',
-        'showAddBtn',
+        'showTableAddBtn',
         'addable',
         'removable',
         'copyable',

package/lib/renderers/Form/InputTag.js

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

package/lib/renderers/Form/InputText.js

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