amis 2.7.3-beta.0 → 2.8.0

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

@@ -1,6 +1,5 @@
 import React from 'react';
-import { FormControlProps } from 'amis-core';
-import { IFormStore } from 'amis-core';
+import { FormControlProps, IFormStore } from 'amis-core';
 import { FormBaseControlSchema, SchemaCollection } from '../../Schema';
 /**
  * InputGroup
@@ -12,6 +11,19 @@ export interface InputGroupControlSchema extends FormBaseControlSchema {
      * FormItem 集合
      */
     body: SchemaCollection;
+    /**
+     * 校验提示信息配置
+     */
+    validationConfig?: {
+        /**
+         * 错误提示的展示模式, full为整体飘红, highlight为仅错误项飘红, 默认为full
+         */
+        errorMode?: 'full' | 'partial';
+        /**
+         * 单个子元素多条校验信息的分隔符
+         */
+        delimiter?: string;
+    };
 }
 export interface InputGroupProps extends FormControlProps {
     body: Array<any>;
@@ -21,11 +33,26 @@ interface InputGroupState {
     isFocused: boolean;
 }
 export declare class InputGroup extends React.Component<InputGroupProps, InputGroupState> {
+    static defaultProps: {
+        validationConfig: {
+            errorMode: string;
+            delimiter: string;
+        };
+    };
+    toDispose: Array<Function>;
     constructor(props: InputGroupProps);
+    componentDidMount(): void;
+    componentDidUpdate(prevProps: Readonly<InputGroupProps>): void;
+    componentWillUnmount(): void;
+    getValidationConfig(): {
+        errorMode: string;
+        delimiter: any;
+    };
+    validateHook(): void;
     handleFocus(): void;
     handleBlur(): void;
     renderControl(control: any, index: any, otherProps?: any): JSX.Element | null;
-    validate(): "" | string[];
+    validate(): string[] | "";
     render(): JSX.Element;
 }
 export default class InputGroupRenderer extends InputGroup {

package/lib/renderers/Form/InputGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -19,13 +19,63 @@ var InputGroup = /** @class */ (function (_super) {
     tslib.__extends(InputGroup, _super);
     function InputGroup(props) {
         var _this = _super.call(this, props) || this;
+        _this.toDispose = [];
         _this.handleFocus = _this.handleFocus.bind(_this);
         _this.handleBlur = _this.handleBlur.bind(_this);
+        _this.validateHook = _this.validateHook.bind(_this);
         _this.state = {
             isFocused: false
         };
         return _this;
     }
+    InputGroup.prototype.componentDidMount = function () {
+        var _a = this.props, addHook = _a.addHook, name = _a.name;
+        if (name && addHook) {
+            this.toDispose.push(addHook(this.validateHook, 'validate'));
+        }
+    };
+    InputGroup.prototype.componentDidUpdate = function (prevProps) {
+        var _a;
+        if (amisCore.anyChanged(['errorCode', 'delimiter'], prevProps === null || prevProps === void 0 ? void 0 : prevProps.validationConfig, (_a = this.props) === null || _a === void 0 ? void 0 : _a.validationConfig)) {
+            this.validateHook();
+        }
+    };
+    InputGroup.prototype.componentWillUnmount = function () {
+        this.toDispose.forEach(function (fn) { return fn(); });
+        this.toDispose = [];
+    };
+    InputGroup.prototype.getValidationConfig = function () {
+        var validationConfig = this.props.validationConfig;
+        return {
+            errorMode: (validationConfig === null || validationConfig === void 0 ? void 0 : validationConfig.errorMode) !== 'partial' ? 'full' : 'partial',
+            delimiter: (validationConfig === null || validationConfig === void 0 ? void 0 : validationConfig.delimiter) &&
+                typeof validationConfig.delimiter === 'string'
+                ? validationConfig.delimiter
+                : '; '
+        };
+    };
+    InputGroup.prototype.validateHook = function () {
+        var _a;
+        var _b = this.props, formStore = _b.formStore, formItem = _b.formItem, name = _b.name;
+        var delimiter = this.getValidationConfig().delimiter;
+        if (!name) {
+            return;
+        }
+        var chidren = (_a = formStore === null || formStore === void 0 ? void 0 : formStore.inputGroupItems) === null || _a === void 0 ? void 0 : _a[name];
+        var errorCollection = chidren
+            .map(function (item, index) {
+            if (item.errors.length <= 0) {
+                return '';
+            }
+            /** 标识符格式: 索引值 + label */
+            var identifier = item.label
+                ? "(".concat(index + 1, ")").concat(item.label)
+                : "(".concat(index + 1, ")");
+            return "".concat(identifier, ": ").concat(item.errors.join(delimiter));
+        })
+            .filter(Boolean);
+        formItem && formItem.setError(errorCollection);
+    };
     InputGroup.prototype.handleFocus = function () {
         this.setState({
             isFocused: true
@@ -50,14 +100,15 @@ var InputGroup = /** @class */ (function (_super) {
         // issue 处理这个，按理不需要这么弄。
         formItem === null || formItem === void 0 ? void 0 : formItem.subFormItems.forEach(function (item) {
             if (item.errors.length) {
-                errors.push.apply(errors, item.errors);
+                errors.push.apply(errors, tslib.__spreadArray([], tslib.__read(item.errors), false));
             }
         });
         return errors.length ? errors : '';
     };
     InputGroup.prototype.render = function () {
         var _this = this;
-        var _a = this.props, body = _a.body, controls = _a.controls, className = _a.className; _a.style; _a.mode; var horizontal = _a.horizontal; _a.formMode; var formHorizontal = _a.formHorizontal, data = _a.data, cx = _a.classnames;
+        var _a = this.props, body = _a.body, controls = _a.controls, className = _a.className; _a.style; _a.mode; var horizontal = _a.horizontal; _a.formMode; var formHorizontal = _a.formHorizontal, data = _a.data, cx = _a.classnames, isStatic = _a.static, disabled = _a.disabled;
+        var errorMode = this.getValidationConfig().errorMode;
         var inputs = Array.isArray(controls) ? controls : body;
         if (!Array.isArray(inputs)) {
             inputs = [];
@@ -76,7 +127,7 @@ var InputGroup = /** @class */ (function (_super) {
             (formHorizontal
                 ? amisCore.makeHorizontalDeeper(formHorizontal, inputs.length)
                 : undefined);
-        return (React__default["default"].createElement("div", { className: cx("InputGroup", className, {
+        return (React__default["default"].createElement("div", { className: cx("InputGroup", "InputGroup-validation--".concat(errorMode), className, {
                 'is-focused': this.state.isFocused
             }) }, inputs.map(function (control, index) {
             var isAddOn = ~[
@@ -91,7 +142,14 @@ var InputGroup = /** @class */ (function (_super) {
                 formHorizontal: horizontalDeeper,
                 formMode: 'normal',
                 inputOnly: true,
+                inputGroupControl: {
+                    name: _this.props.name,
+                    path: _this.props.$path,
+                    schema: _this.props.$schema
+                },
                 key: index,
+                static: isStatic,
+                disabled: disabled,
                 onFocus: _this.handleFocus,
                 onBlur: _this.handleBlur
             });
@@ -100,6 +158,12 @@ var InputGroup = /** @class */ (function (_super) {
                     : 'InputGroup-addOn') }, dom)) : (dom);
         })));
     };
+    InputGroup.defaultProps = {
+        validationConfig: {
+            errorMode: 'full',
+            delimiter: '; '
+        }
+    };
     return InputGroup;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/Form/InputImage.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -542,7 +542,7 @@ var ImageControl = /** @class */ (function (_super) {
         if (this.reuploadIndex !== undefined) {
             finalFiles = currentFiles.concat();
             // 因为单个文件重新上传也能选择多个，都插到一起
-            finalFiles.splice.apply(finalFiles, tslib.__spreadArray([this.reuploadIndex, 1], inputFiles, false));
+            finalFiles.splice.apply(finalFiles, tslib.__spreadArray([this.reuploadIndex, 1], tslib.__read(inputFiles), false));
             this.reuploadIndex = undefined;
         }
         else {
@@ -634,7 +634,7 @@ var ImageControl = /** @class */ (function (_super) {
                         }
                         obj = tslib.__assign(tslib.__assign({}, ret.data), { state: 'uploaded' });
                         obj.value = obj.value || obj.url;
-                        return [4 /*yield*/, this.dispatchEvent('success', tslib.__assign(tslib.__assign({}, file), { item: tslib.__assign(tslib.__assign({}, file), ret.data), value: obj.value }))];
+                        return [4 /*yield*/, this.dispatchEvent('success', tslib.__assign(tslib.__assign({}, file), { item: file, result: ret.data, value: obj.value }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {

package/lib/renderers/Form/InputMonthRange.js

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

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

@@ -106,6 +106,10 @@ export interface NumberProps extends FormControlProps {
      * 是否是大数，如果是的话输入输出都将是字符串
      */
     big?: boolean;
+    /**
+     * 是否在清空内容时从数据域中删除该表单项对应的值
+     */
+    clearValueOnEmpty?: boolean;
 }
 interface NumberState {
     unit?: string;

package/lib/renderers/Form/InputNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.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,13 @@ 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 }),
+            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));
     };
     NumberControl.defaultProps = {
         step: 1,
-        resetValue: ''
+        resetValue: '',
+        clearValueOnEmpty: false
     };
     tslib.__decorate([
         amisCore.autobind,

package/lib/renderers/Form/InputQuarterRange.js

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

package/lib/renderers/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.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.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputRepeat.js

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

package/lib/renderers/Form/InputRichText.js

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

package/lib/renderers/Form/InputSubForm.js

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