amis 2.1.1-beta.2 → 2.3.0

package/esm/renderers/Form/InputExcel.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import DropZone from 'react-dropzone';
-import { createObject, autobind, FormItem } from 'amis-core';
+import { createObject, isObject, autobind, FormItem } from 'amis-core';
 
 var ExcelControl = /** @class */ (function (_super) {
     __extends(ExcelControl, _super);
@@ -88,6 +88,58 @@ var ExcelControl = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * 检查当前单元格数据是否为富文本
+     *
+     * @reference https://github.com/exceljs/exceljs#rich-text
+     */
+    ExcelControl.prototype.isRichTextValue = function (value) {
+        return !!(value &&
+            isObject(value) &&
+            value.hasOwnProperty('richText') &&
+            Array.isArray(value === null || value === void 0 ? void 0 : value.richText));
+    };
+    /**
+     * 将富文本类型的单元格内容转化为Plain Text
+     *
+     * @param {CellRichTextValue} cellValue 单元格值
+     * @param {Boolean} html 是否输出为html格式
+     */
+    ExcelControl.prototype.richText2PlainString = function (cellValue, html) {
+        if (html === void 0) { html = false; }
+        var result = cellValue.richText.map(function (_a) {
+            var text = _a.text, _b = _a.font, font = _b === void 0 ? {} : _b;
+            var outputStr = text;
+            /* 如果以HTML格式输出，简单处理一下样式 */
+            if (html) {
+                var styles = '';
+                var htmlTag = (font === null || font === void 0 ? void 0 : font.bold)
+                    ? 'strong'
+                    : (font === null || font === void 0 ? void 0 : font.italic)
+                        ? 'em'
+                        : (font === null || font === void 0 ? void 0 : font.vertAlign) === 'superscript'
+                            ? 'sup'
+                            : (font === null || font === void 0 ? void 0 : font.vertAlign) === 'subscript'
+                                ? 'sub'
+                                : 'span';
+                if (font === null || font === void 0 ? void 0 : font.strike) {
+                    styles += 'text-decoration: line-through;';
+                }
+                else if (font === null || font === void 0 ? void 0 : font.underline) {
+                    styles += 'text-decoration: underline;';
+                }
+                if (font === null || font === void 0 ? void 0 : font.outline) {
+                    styles += 'outline: solid;';
+                }
+                if (font === null || font === void 0 ? void 0 : font.size) {
+                    styles += "font-size: ".concat(font.size, "px;");
+                }
+                outputStr = "<".concat(htmlTag, " ").concat(styles ? "style=".concat(styles) : '', ">").concat(text, "</").concat(htmlTag, ">");
+            }
+            return outputStr;
+        });
+        return result.join('');
+    };
     /**
      * 读取单个 sheet 的内容
      */
@@ -106,9 +158,14 @@ var ExcelControl = /** @class */ (function (_super) {
         else {
             var firstRowValues_1 = [];
             worksheet.eachRow(function (row, rowNumber) {
+                var _a;
                 // 将第一列作为字段名
                 if (rowNumber == 1) {
-                    firstRowValues_1 = row.values;
+                    firstRowValues_1 = ((_a = row.values) !== null && _a !== void 0 ? _a : []).map(function (item) {
+                        return _this.isRichTextValue(item)
+                            ? _this.richText2PlainString(item)
+                            : item;
+                    });
                 }
                 else {
                     var data_1 = {};

package/esm/renderers/Form/InputFile.d.ts

@@ -246,7 +246,7 @@ export default class FileControl extends React.Component<FileProps, FileState> {
     syncAutoFill(): void;
     uploadFile(file: FileX, receiver: string, params: object, config: Partial<FileProps> | undefined, onProgress: (progress: number) => void): Promise<Payload>;
     uploadBigFile(file: FileX, receiver: string, params: object, config: Partial<FileProps> | undefined, onProgress: (progress: number) => void): Promise<Payload>;
-    _send(file: FileX, api: ApiObject | ApiString, data?: any, options?: object, onProgress?: (progress: number) => void): Promise<Payload>;
+    _send(file: FileX, api: ApiObject | ApiString, data?: any, options?: object, onProgress?: (progress: number) => void, maxRetryLimit?: number): Promise<Payload>;
     removeFileCanelExecutor(file: any, execute?: boolean): void;
     validate(): any;
     dispatchEvent(e: string, data?: Record<string, any>): Promise<any>;

package/esm/renderers/Form/InputFile.js

@@ -1,14 +1,13 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __decorate } from 'tslib';
 import React from 'react';
-import { guid, createObject, normalizeApi, buildApi, isEmpty, dataMapping, qsstringify, FormItem, isEffectiveApi, isApiOutdated, isApiOutdatedWithData } from 'amis-core';
+import { guid, createObject, normalizeApi, buildApi, isEmpty, dataMapping, qsstringify, prettyBytes, FormItem, isEffectiveApi, isApiOutdated, isApiOutdatedWithData } from 'amis-core';
 import find from 'lodash/find';
 import isPlainObject from 'lodash/isPlainObject';
-import ImageControl from './InputImage.js';
 import { Icon, Button, TooltipWrapper } from 'amis-ui';
 import DropZone from 'react-dropzone';
 import merge from 'lodash/merge';
@@ -152,8 +151,8 @@ var FileControl = /** @class */ (function (_super) {
                 // this.props.env.alert(
                 //   __('File.maxSize', {
                 //     filename: file[nameField as keyof typeof file] || file.name,
-                //     actualSize: ImageControl.formatFileSize(file.size),
-                //     maxSize: ImageControl.formatFileSize(maxSize)
+                //     actualSize: prettyBytes(file.size),
+                //     maxSize: prettyBytes(maxSize)
                 //   })
                 // );
                 file.state = 'invalid';
@@ -676,9 +675,7 @@ var FileControl = /** @class */ (function (_super) {
                     // Note: File类型字段放在后面，可以支持第三方云存储鉴权
                     fd.append(config.fieldName || 'file', blob, file.name);
                     return self
-                        ._send(file, api, fd, {}, function (progress) {
-                        return updateProgress(task.partNumber, progress);
-                    })
+                        ._send(file, api, fd, {}, function (progress) { return updateProgress(task.partNumber, progress); }, 3)
                         .then(function (ret) {
                         state.loaded++;
                         return {
@@ -710,23 +707,49 @@ var FileControl = /** @class */ (function (_super) {
             }
         });
     };
-    FileControl.prototype._send = function (file, api, data, options, onProgress) {
-        var _this = this;
-        var env = this.props.env;
-        if (!env || !env.fetcher) {
-            throw new Error('fetcher is required');
-        }
-        return env.fetcher(api, data, __assign(__assign({ method: 'post' }, options), { withCredentials: true, cancelExecutor: function (cancelExecutor) {
-                // 记录取消器，取消的时候要调用
-                _this.fileUploadCancelExecutors.push({
-                    file: file,
-                    executor: cancelExecutor
-                });
-            }, onUploadProgress: onProgress
-                ? function (event) {
-                    return onProgress(event.loaded / event.total);
+    FileControl.prototype._send = function (file, api, data, options, onProgress, maxRetryLimit) {
+        if (maxRetryLimit === void 0) { maxRetryLimit = 0; }
+        return __awaiter(this, void 0, void 0, function () {
+            var env, __, result, error_1;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        env = this.props.env;
+                        __ = this.props.translate;
+                        if (!env || !env.fetcher) {
+                            throw new Error('fetcher is required');
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, env.fetcher(api, data, __assign(__assign({ method: 'post' }, options), { withCredentials: true, cancelExecutor: function (cancelExecutor) {
+                                    // 记录取消器，取消的时候要调用
+                                    _this.fileUploadCancelExecutors.push({
+                                        file: file,
+                                        executor: cancelExecutor
+                                    });
+                                }, onUploadProgress: onProgress
+                                    ? function (event) {
+                                        return onProgress(event.loaded / event.total);
+                                    }
+                                    : undefined }))];
+                    case 2:
+                        result = _a.sent();
+                        if (!result.ok) {
+                            throw new Error(result.msg || __('File.errorRetry'));
+                        }
+                        return [2 /*return*/, result];
+                    case 3:
+                        error_1 = _a.sent();
+                        if (maxRetryLimit > 0) {
+                            return [2 /*return*/, this._send(file, api, data, options, onProgress, maxRetryLimit - 1)];
+                        }
+                        throw error_1;
+                    case 4: return [2 /*return*/];
                 }
-                : undefined }));
+            });
+        });
     };
     FileControl.prototype.removeFileCanelExecutor = function (file, execute) {
         if (execute === void 0) { execute = false; }
@@ -820,7 +843,9 @@ var FileControl = /** @class */ (function (_super) {
                             __('File.dragDrop'),
                             React.createElement("span", { className: cx('FileControl-acceptTip-click') }, __('File.clickUpload'))),
                         React.createElement("div", { className: cx('FileControl-acceptTip-help', 'TplField') }, documentLink ? (React.createElement("a", { href: documentLink, onClick: function (e) { return e.stopPropagation(); } }, documentation ? documentation : __('File.helpText'))) : null),
-                        maxSize ? (React.createElement("div", { className: cx('FileControl-sizeTip') }, __('File.sizeLimit', { maxSize: maxSize }))) : null)) : (React.createElement(React.Fragment, null,
+                        maxSize ? (React.createElement("div", { className: cx('FileControl-sizeTip') }, __('File.sizeLimit', {
+                            maxSize: prettyBytes(maxSize, 1024)
+                        }))) : null)) : (React.createElement(React.Fragment, null,
                         React.createElement(Button, { level: "default", disabled: disabled, className: cx('FileControl-selectBtn', btnClassName, {
                                 'is-disabled': multiple && !!maxLength && files.length >= maxLength
                             }), tooltip: multiple && maxLength && files.length >= maxLength
@@ -840,7 +865,7 @@ var FileControl = /** @class */ (function (_super) {
                         })
                         : null));
             }),
-            maxSize && !drag ? (React.createElement("div", { className: cx('FileControl-sizeTip') }, __('File.sizeLimit', { maxSize: maxSize }))) : null,
+            maxSize && !drag ? (React.createElement("div", { className: cx('FileControl-sizeTip') }, __('File.sizeLimit', { maxSize: prettyBytes(maxSize, 1024) }))) : null,
             Array.isArray(files) ? (React.createElement("ul", { className: cx('FileControl-list') }, files.map(function (file, index) {
                 var filename = file[nameField] ||
                     file.filename;
@@ -850,8 +875,8 @@ var FileControl = /** @class */ (function (_super) {
                                 (maxSize && file.size > maxSize
                                     ? __('File.maxSize', {
                                         filename: file.name,
-                                        actualSize: ImageControl.formatFileSize(file.size),
-                                        maxSize: ImageControl.formatFileSize(maxSize)
+                                        actualSize: prettyBytes(file.size, 1024),
+                                        maxSize: prettyBytes(maxSize, 1024)
                                     })
                                     : '')
                             : '' },
@@ -927,8 +952,9 @@ var FileControlRenderer = /** @class */ (function (_super) {
             sizeMutable: false,
             renderDescription: false,
             shouldComponentUpdate: function (props, prevProps) {
-                return !!isEffectiveApi(props.receiver, props.data) && (isApiOutdated(props.receiver, prevProps.receiver, props.data, prevProps.data) ||
-                    isApiOutdatedWithData(props.receiver, prevProps.receiver, props.data, prevProps.data));
+                return !!isEffectiveApi(props.receiver, props.data) &&
+                    (isApiOutdated(props.receiver, prevProps.receiver, props.data, prevProps.data) ||
+                        isApiOutdatedWithData(props.receiver, prevProps.receiver, props.data, prevProps.data));
             }
         })
     ], FileControlRenderer);

package/esm/renderers/Form/InputFormula.d.ts

@@ -14,6 +14,13 @@ export interface InputFormulaControlSchema extends FormBaseControlSchema {
      * 默认为 true
      */
     evalMode?: boolean;
+    /**
+     * 混合模式，意味着这个输入框既可以输入不同文本
+     * 也可以输入公式。
+     * 当输入公式时，值格式为 ${公式内容}
+     * 其他内容当字符串。
+     */
+    mixedMode?: boolean;
     /**
      * 用于提示的变量集合，默认为空
      */

package/esm/renderers/Form/InputFormula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -35,7 +35,7 @@ import { FormulaPicker } from 'amis-ui';
         }
     };
     InputFormulaRenderer.prototype.render = function () {
-        var _a = this.props; _a.selectedOptions; var disabled = _a.disabled, onChange = _a.onChange, evalMode = _a.evalMode, variableMode = _a.variableMode, header = _a.header, label = _a.label, value = _a.value, clearable = _a.clearable, className = _a.className; _a.classPrefix; _a.classnames; var _b = _a.allowInput, allowInput = _b === void 0 ? true : _b, borderMode = _a.borderMode, placeholder = _a.placeholder, inputMode = _a.inputMode, btnLabel = _a.btnLabel, level = _a.level, btnSize = _a.btnSize, icon = _a.icon, title = _a.title, variableClassName = _a.variableClassName, functionClassName = _a.functionClassName, data = _a.data, onPickerOpen = _a.onPickerOpen, selfVariableName = _a.selfVariableName;
+        var _a = this.props; _a.selectedOptions; var disabled = _a.disabled, onChange = _a.onChange, evalMode = _a.evalMode, mixedMode = _a.mixedMode, variableMode = _a.variableMode, header = _a.header, label = _a.label, value = _a.value, clearable = _a.clearable, className = _a.className; _a.classPrefix; _a.classnames; var _b = _a.allowInput, allowInput = _b === void 0 ? true : _b, borderMode = _a.borderMode, placeholder = _a.placeholder, inputMode = _a.inputMode, btnLabel = _a.btnLabel, level = _a.level, btnSize = _a.btnSize, icon = _a.icon, title = _a.title, variableClassName = _a.variableClassName, functionClassName = _a.functionClassName, data = _a.data, onPickerOpen = _a.onPickerOpen, selfVariableName = _a.selfVariableName;
         var _c = this.props, variables = _c.variables, functions = _c.functions;
         if (isPureVariable(variables)) {
             // 如果 variables 是 ${xxx} 这种形式，将其处理成实际的值
@@ -45,7 +45,7 @@ import { FormulaPicker } from 'amis-ui';
             // 如果 functions 是 ${xxx} 这种形式，将其处理成实际的值
             functions = resolveVariableAndFilter(functions, this.props.data, '| raw');
         }
-        return (React.createElement(FormulaPicker, { ref: this.formulaRef, className: className, value: value, disabled: disabled, allowInput: allowInput, onChange: onChange, evalMode: evalMode, variables: variables, variableMode: variableMode, functions: functions, header: header || label || '', borderMode: borderMode, placeholder: placeholder, mode: inputMode, btnLabel: btnLabel, level: level, btnSize: btnSize, icon: icon, title: title, clearable: clearable, variableClassName: variableClassName, functionClassName: functionClassName, data: data, onPickerOpen: onPickerOpen, selfVariableName: selfVariableName }));
+        return (React.createElement(FormulaPicker, { ref: this.formulaRef, className: className, value: value, disabled: disabled, allowInput: allowInput, onChange: onChange, evalMode: evalMode, variables: variables, variableMode: variableMode, functions: functions, header: header || label || '', borderMode: borderMode, placeholder: placeholder, mode: inputMode, btnLabel: btnLabel, level: level, btnSize: btnSize, icon: icon, title: title, clearable: clearable, variableClassName: variableClassName, functionClassName: functionClassName, data: data, onPickerOpen: onPickerOpen, selfVariableName: selfVariableName, mixedMode: mixedMode }));
     };
     InputFormulaRenderer.defaultProps = {
         inputMode: 'input-button',

package/esm/renderers/Form/InputGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { FormControlProps } from 'amis-core';
-import { FileRejection } from 'react-dropzone';
+import { FileRejection, DropEvent } from 'react-dropzone';
 import 'blueimp-canvastoblob';
 import { Payload, ActionObject } from 'amis-core';
 import { ImageThumbProps } from '../Image';
@@ -182,6 +182,14 @@ export interface ImageControlSchema extends FormBaseControlSchema {
      * 初始化时是否把其他字段同步到表单内部。
      */
     initAutoFill?: boolean;
+    /**
+     * 初始化时是否打开裁剪模式
+     */
+    initCrop?: boolean;
+    /**
+     * 图片上传完毕是否进入裁剪模式
+     */
+    dropCrop?: boolean;
     /**
      * 默认占位图图片地址
      */
@@ -246,8 +254,8 @@ export default class ImageControl extends React.Component<ImageProps, ImageState
         delimiter: string;
         autoUpload: boolean;
         multiple: boolean;
+        dropCrop: boolean;
     };
-    static formatFileSize(size: number | string, units?: string[]): string;
     static valueToFile(value: string | object, props?: ImageProps): FileValue | undefined;
     static sizeInfo(width: number | undefined, height: number | undefined, __: TranslateFn): string;
     state: ImageState;
@@ -264,6 +272,7 @@ export default class ImageControl extends React.Component<ImageProps, ImageState
     emitValue: any;
     unmounted: boolean;
     initAutoFill: boolean;
+    reuploadIndex: undefined | number;
     constructor(props: ImageProps);
     componentDidMount(): void;
     componentDidUpdate(prevProps: ImageProps): void;
@@ -293,7 +302,7 @@ export default class ImageControl extends React.Component<ImageProps, ImageState
     syncAutoFill(): void;
     handleSelect(): void;
     handleRetry(index: number): void;
-    handleDrop(files: Array<FileX>): void;
+    handleDrop(files: Array<FileX>, e?: any, event?: DropEvent): void;
     handlePaste(e: React.ClipboardEvent<any>): void;
     handleCrop(): void;
     cancelCrop(): void;
@@ -309,6 +318,7 @@ export default class ImageControl extends React.Component<ImageProps, ImageState
     validate(): any;
     dispatchEvent(e: string, data?: Record<string, any>): Promise<any>;
     doAction(action: ActionObject, data: object, throwErrors: boolean): void;
+    handleReSelect(index: number): void;
     render(): JSX.Element;
 }
 export declare class ImageControlRenderer extends ImageControl {

package/esm/renderers/Form/InputImage.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __assign, __awaiter, __generator, __decorate } from 'tslib';
+import { __extends, __assign, __awaiter, __generator, __spreadArray, __decorate } from 'tslib';
 import React, { Suspense } from 'react';
-import { guid, isEmpty, dataMapping, buildApi, createObject, qsparse, qsstringify, filter, FormItem } from 'amis-core';
+import { guid, isEmpty, dataMapping, prettyBytes, buildApi, createObject, qsparse, qsstringify, filter, FormItem } from 'amis-core';
 import DropZone from 'react-dropzone';
 import 'blueimp-canvastoblob';
 import find from 'lodash/find';
@@ -35,6 +35,8 @@ var ImageControl = /** @class */ (function (_super) {
         _this_1.frameImageRef = React.createRef();
         _this_1.current = null;
         _this_1.unmounted = false;
+        // 文件重新上传的位置标记，用以定位替换
+        _this_1.reuploadIndex = undefined;
         var value = props.value;
         var multiple = props.multiple;
         var joinValues = props.joinValues;
@@ -72,17 +74,9 @@ var ImageControl = /** @class */ (function (_super) {
         _this_1.handleSelect = _this_1.handleSelect.bind(_this_1);
         _this_1.handlePaste = _this_1.handlePaste.bind(_this_1);
         _this_1.syncAutoFill = _this_1.syncAutoFill.bind(_this_1);
+        _this_1.handleReSelect = _this_1.handleReSelect.bind(_this_1);
         return _this_1;
     }
-    ImageControl.formatFileSize = function (size, units) {
-        if (units === void 0) { units = [' B', ' KB', ' M', ' G']; }
-        size = parseInt(size, 10) || 0;
-        while (size > 1024 && units.length > 1) {
-            size /= 1024;
-            units.shift();
-        }
-        return size.toFixed(2) + units[0];
-    };
     ImageControl.valueToFile = function (value, props) {
         return value
             ? __assign(__assign({}, (typeof value === 'string'
@@ -109,11 +103,14 @@ var ImageControl = /** @class */ (function (_super) {
                 ? this.syncAutoFill()
                 : addHook(this.syncAutoFill, 'init');
         }
+        if (this.props.initCrop && this.files.length) {
+            this.editImage(0);
+        }
     };
     ImageControl.prototype.componentDidUpdate = function (prevProps) {
         var _this_1 = this;
         var props = this.props;
-        if (prevProps.value !== props.value && this.emitValue !== props.value) {
+        if (prevProps.value !== props.value) {
             var value = props.value;
             var multiple = props.multiple;
             var joinValues = props.joinValues;
@@ -416,6 +413,8 @@ var ImageControl = /** @class */ (function (_super) {
         }
     };
     ImageControl.prototype.handleSelect = function () {
+        // 清除标记，以免影响正常上传
+        this.reuploadIndex = undefined;
         this.dropzone.current && this.dropzone.current.open();
     };
     ImageControl.prototype.handleRetry = function (index) {
@@ -430,9 +429,9 @@ var ImageControl = /** @class */ (function (_super) {
             files: files
         }, this.startUpload);
     };
-    ImageControl.prototype.handleDrop = function (files) {
-        var _a = this.props, multiple = _a.multiple, crop = _a.crop;
-        if (crop && !multiple) {
+    ImageControl.prototype.handleDrop = function (files, e, event) {
+        var _a = this.props, multiple = _a.multiple, crop = _a.crop, dropCrop = _a.dropCrop;
+        if (crop && !multiple && dropCrop) {
             var file = files[0];
             if (!file.preview || !file.url) {
                 file.preview = window.URL.createObjectURL(file);
@@ -442,6 +441,10 @@ var ImageControl = /** @class */ (function (_super) {
                 cropFileName: file.name
             });
         }
+        // 拖拽的情况，没有比他更靠前的方法，只能在这里判断
+        if (event && event.type === 'drop' && this.reuploadIndex !== undefined) {
+            this.reuploadIndex = undefined;
+        }
         this.addFiles(files);
     };
     ImageControl.prototype.handlePaste = function (e) {
@@ -459,6 +462,8 @@ var ImageControl = /** @class */ (function (_super) {
             blob.id = guid();
             files.push(blob);
         });
+        // 清除标记，以免影响正常上传
+        this.reuploadIndex = undefined;
         this.handleDrop(files);
     };
     ImageControl.prototype.handleCrop = function () {
@@ -504,8 +509,8 @@ var ImageControl = /** @class */ (function (_super) {
             if (maxSize && file.size > maxSize) {
                 _this_1.props.env.alert(__('File.maxSize', {
                     filename: file.name,
-                    actualSize: ImageControl.formatFileSize(file.size),
-                    maxSize: ImageControl.formatFileSize(maxSize)
+                    actualSize: prettyBytes(file.size, 1024),
+                    maxSize: prettyBytes(maxSize, 1024)
                 }));
                 return;
             }
@@ -519,9 +524,20 @@ var ImageControl = /** @class */ (function (_super) {
         if (!inputFiles.length) {
             return;
         }
+        var finalFiles = [];
+        // 替换
+        if (this.reuploadIndex !== undefined) {
+            finalFiles = currentFiles.concat();
+            // 因为单个文件重新上传也能选择多个，都插到一起
+            finalFiles.splice.apply(finalFiles, __spreadArray([this.reuploadIndex, 1], inputFiles, false));
+            this.reuploadIndex = undefined;
+        }
+        else {
+            finalFiles = currentFiles.concat(inputFiles);
+        }
         this.setState({
             error: undefined,
-            files: (this.files = currentFiles.concat(inputFiles)),
+            files: (this.files = finalFiles),
             locked: true
         }, function () {
             var autoUpload = _this_1.props.autoUpload;
@@ -789,6 +805,11 @@ var ImageControl = /** @class */ (function (_super) {
             onChange('');
         }
     };
+    // 重新上传
+    ImageControl.prototype.handleReSelect = function (index) {
+        this.reuploadIndex = index;
+        this.dropzone.current && this.dropzone.current.open();
+    };
     ImageControl.prototype.render = function () {
         var _this_1 = this;
         var _a = this.props, className = _a.className, 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;
@@ -859,7 +880,9 @@ var ImageControl = /** @class */ (function (_super) {
                                         reCropable !== false &&
                                         !disabled ? (React.createElement("a", { "data-tooltip": __('Image.crop'), "data-position": "bottom", onClick: _this_1.editImage.bind(_this_1, key) },
                                         React.createElement(Icon, { icon: "pencil", className: "icon" }))) : null,
-                                    !disabled ? (React.createElement("a", { "data-tooltip": __('Select.upload'), "data-position": "bottom", onClick: _this_1.handleSelect },
+                                    !disabled ? (React.createElement("a", { "data-tooltip": __('Select.upload'), "data-position": "bottom", onClick: function () {
+                                            return _this_1.handleReSelect(key);
+                                        } },
                                         React.createElement(Icon, { icon: "upload", className: "icon" }))) : null,
                                     !disabled ? (React.createElement("a", { "data-tooltip": __('Select.clear'), "data-position": "bottom", onClick: _this_1.removeFile.bind(_this_1, file, key) },
                                         React.createElement(Icon, { icon: "remove", className: "icon" }))) : null) }))))); })
@@ -886,11 +909,11 @@ var ImageControl = /** @class */ (function (_super) {
         extractValue: false,
         delimiter: ',',
         autoUpload: true,
-        multiple: false
+        multiple: false,
+        dropCrop: true
     };
     return ImageControl;
 }(React.Component));
-var ImageControl$1 = ImageControl;
 var ImageControlRenderer = /** @class */ (function (_super) {
     __extends(ImageControlRenderer, _super);
     function ImageControlRenderer() {
@@ -905,4 +928,4 @@ var ImageControlRenderer = /** @class */ (function (_super) {
     return ImageControlRenderer;
 }(ImageControl));
 
-export { ImageControlRenderer, ImageControl$1 as default };
+export { ImageControlRenderer, ImageControl as default };

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import InputDateRange, { DateRangeControlSchema } from './InputDateRange';
 /**
  * MonthRange 月范围控件
@@ -17,5 +18,6 @@ export declare class MonthRangeControlRenderer extends MonthRangeControl {
         delimiter: string;
         timeFormat: string;
         ranges: string;
+        animation: boolean;
     };
 }

package/esm/renderers/Form/InputMonthRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -33,7 +33,8 @@ var MonthRangeControl = /** @class */ (function (_super) {
         joinValues: true,
         delimiter: ',',
         timeFormat: '',
-        ranges: 'thismonth,prevmonth'
+        ranges: 'thismonth,prevmonth',
+        animation: true
     };
     MonthRangeControlRenderer = __decorate([
         FormItem({

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

@@ -1,7 +1,6 @@
 import React from 'react';
 import { FormControlProps } from 'amis-core';
-import { Option } from 'amis-core';
-import { PlainObject, ActionObject } from 'amis-core';
+import { Option, PlainObject, ActionObject } from 'amis-core';
 import { FormBaseControlSchema } from '../../Schema';
 /**
  * 数字输入框
@@ -45,6 +44,10 @@ export interface NumberControlSchema extends FormBaseControlSchema {
      * 单位列表
      */
     unitOptions?: string | Array<Option> | string[] | PlainObject;
+    /**
+     * 是否是大数，如果是的话输入输出都将是字符串
+     */
+    big?: boolean;
     /**
      * 是否千分分隔
      */
@@ -96,6 +99,10 @@ export interface NumberProps extends FormControlProps {
      * 输入框为基础输入框还是加强输入框
      */
     displayMode?: 'base' | 'enhance';
+    /**
+     * 是否是大数，如果是的话输入输出都将是字符串
+     */
+    big?: boolean;
 }
 interface NumberState {
     unit?: string;