amis 2.8.0 → 3.0.0

package/esm/renderers/Form/InputImage.js

@@ -1,15 +1,15 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __spreadArray, __read, __decorate } from 'tslib';
 import React, { Suspense } from 'react';
-import { guid, isEmpty, dataMapping, prettyBytes, buildApi, createObject, qsparse, qsstringify, resolveEventData, filter, FormItem } from 'amis-core';
-import DropZone from 'react-dropzone';
+import { guid, isEmpty, dataMapping, prettyBytes, buildApi, createObject, qsparse, qsstringify, resolveEventData, insertCustomStyle, filter, FormItem } from 'amis-core';
+import DropZone, { ErrorCode } from 'react-dropzone';
 import 'blueimp-canvastoblob';
 import find from 'lodash/find';
-import { Icon, Button } from 'amis-ui';
+import { Icon, TooltipWrapper, Button } from 'amis-ui';
 import accepts from 'attr-accept';
 import { getNameFromUrl } from './InputFile.js';
 import ThemedImageThumb from '../Image.js';
@@ -29,7 +29,8 @@ var ImageControl = /** @class */ (function (_super) {
         _this_1.state = {
             uploading: false,
             locked: false,
-            files: []
+            files: [],
+            dropMultiple: false
         };
         _this_1.files = [];
         _this_1.fileUploadCancelExecutors = [];
@@ -55,7 +56,7 @@ var ImageControl = /** @class */ (function (_super) {
                 .map(function (item) { return ImageControl.valueToFile(item); })
                 .filter(function (item) { return item; });
         }
-        _this_1.state = __assign(__assign({}, _this_1.state), { files: (_this_1.files = files), crop: _this_1.buildCrop(props), frameImageWidth: 0 });
+        _this_1.state = __assign(__assign({}, _this_1.state), { files: (_this_1.files = files), crop: _this_1.buildCrop(props), dropMultiple: props.multiple, frameImageWidth: 0 });
         _this_1.sendFile = _this_1.sendFile.bind(_this_1);
         _this_1.removeFile = _this_1.removeFile.bind(_this_1);
         _this_1.handleDrop = _this_1.handleDrop.bind(_this_1);
@@ -77,6 +78,7 @@ var ImageControl = /** @class */ (function (_super) {
         _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);
+        _this_1.handleFileCancel = _this_1.handleFileCancel.bind(_this_1);
         return _this_1;
     }
     ImageControl.valueToFile = function (value, props) {
@@ -139,6 +141,11 @@ var ImageControl = /** @class */ (function (_super) {
                 files: (this.files = files)
             }, this.initAutoFill ? this.syncAutoFill : function () { });
         }
+        if (prevProps.multiple !== props.multiple) {
+            this.setState({
+                dropMultiple: props.multiple
+            });
+        }
         if (prevProps.crop !== props.crop) {
             this.setState({
                 crop: this.buildCrop(props)
@@ -164,22 +171,78 @@ var ImageControl = /** @class */ (function (_super) {
         return crop;
     };
     ImageControl.prototype.handleDropRejected = function (rejectedFiles, evt) {
+        var _a;
         if (evt.type !== 'change' && evt.type !== 'drop') {
             return;
         }
-        var _a = this.props; _a.multiple; var env = _a.env, accept = _a.accept, __ = _a.translate;
-        var files = rejectedFiles.map(function (fileRejection) { return (__assign(__assign({}, fileRejection.file), { state: 'invalid', id: guid(), name: fileRejection.file.name })); });
-        // this.setState({
-        //   files: this.files = multiple
-        //     ? this.files.concat(files)
-        //     : this.files.length
-        //     ? this.files
-        //     : files.slice(0, 1)
-        // });
-        env.alert(__('File.invalidType', {
-            files: files.map(function (file) { return "\u300C".concat(file.name, "\u300D"); }).join(' '),
-            accept: accept
-        }));
+        var _b = this.props, accept = _b.accept, multiple = _b.multiple, onChange = _b.onChange, maxLength = _b.maxLength, maxSize = _b.maxSize, __ = _b.translate;
+        var reFiles = rejectedFiles.map(function (item) { return item.file; });
+        var currentFiles = this.files;
+        if (!multiple && currentFiles.length) {
+            currentFiles = [];
+        }
+        var allowed = (multiple
+            ? maxLength
+                ? maxLength
+                : reFiles.length + currentFiles.length
+            : 1) - currentFiles.length;
+        // 限制过多的错误文件
+        if (allowed <= 0) {
+            return;
+        }
+        var errorFiles = [].slice.call(reFiles, 0, allowed);
+        var formatFile = function (file) {
+            var _a;
+            file.id = guid();
+            var errors = (_a = rejectedFiles.find(function (i) { return i.file === file; })) === null || _a === void 0 ? void 0 : _a.errors;
+            if (errors) {
+                file.error = errors
+                    .map(function (err) {
+                    // 类型错误
+                    if (err.code === ErrorCode.FileInvalidType) {
+                        return __('File.invalidType', {
+                            files: file.name,
+                            accept: accept
+                        });
+                    }
+                    // 文件太大
+                    else if (err.code === ErrorCode.FileTooLarge) {
+                        return __('File.sizeLimit', { maxSize: maxSize });
+                    }
+                })
+                    .join('; ');
+            }
+            file.state = 'invalid';
+            return file;
+        };
+        if (multiple) {
+            if (this.reuploadIndex !== undefined) {
+                currentFiles.splice(this.reuploadIndex, 1, formatFile(errorFiles[0]));
+                this.reuploadIndex = undefined;
+            }
+            else {
+                errorFiles.forEach(function (item) {
+                    currentFiles.push(formatFile(item));
+                });
+            }
+            this.setState({
+                files: (this.files = currentFiles),
+                dropMultiple: multiple
+            });
+        }
+        else {
+            var file = formatFile(errorFiles[0]);
+            this.setState({
+                error: (_a = file === null || file === void 0 ? void 0 : file.error) !== null && _a !== void 0 ? _a : '',
+                files: (this.files = []),
+                dropMultiple: multiple
+            }, function () { return onChange(undefined); });
+        }
+    };
+    ImageControl.prototype.handleFileCancel = function () {
+        this.setState({
+            dropMultiple: this.props.multiple
+        });
     };
     ImageControl.prototype.startUpload = function (retry) {
         if (retry === void 0) { retry = false; }
@@ -214,8 +277,7 @@ var ImageControl = /** @class */ (function (_super) {
         if (this.current || !this.state.uploading) {
             return;
         }
-        var env = this.props.env;
-        var __ = this.props.translate;
+        var _a = this.props, __ = _a.translate, multiple = _a.multiple;
         var file = find(this.files, function (item) { return item.state === 'pending'; });
         if (file) {
             this.current = file;
@@ -234,22 +296,20 @@ var ImageControl = /** @class */ (function (_super) {
                         newFile.state =
                             file.state !== 'uploading' ? file.state : 'error';
                         newFile.error = error;
-                        if (!_this_1.props.multiple && newFile.state === 'invalid') {
-                            files.splice(idx, 1);
+                        if (!multiple) {
                             _this_1.current = null;
                             return _this_1.setState({
-                                files: (_this_1.files = files),
+                                files: (_this_1.files = []),
                                 error: error
                             }, _this_1.tick);
                         }
-                        env.notify('error', error || __('File.errorRetry'));
                     }
                     else {
                         newFile = __assign(__assign({ name: file.name || _this_1.state.cropFileName }, obj), { preview: file.preview });
                     }
                     files.splice(idx, 1, newFile);
                     _this_1.current = null;
-                    _this_1.setState({
+                    return _this_1.setState({
                         files: (_this_1.files = files)
                     }, _this_1.tick);
                 }, function (progress) {
@@ -278,7 +338,7 @@ var ImageControl = /** @class */ (function (_super) {
                             _a.sent();
                             if (this.resolve) {
                                 this.resolve(this.files.some(function (file) { return file.state === 'error'; })
-                                    ? __('File.errorRetry')
+                                    ? __('Image.errorRetry')
                                     : null);
                                 this.resolve = undefined;
                             }
@@ -429,6 +489,7 @@ var ImageControl = /** @class */ (function (_super) {
         }, this.startUpload);
     };
     ImageControl.prototype.handleDrop = function (files, e, event) {
+        var _this_1 = this;
         var _a = this.props, multiple = _a.multiple, crop = _a.crop, dropCrop = _a.dropCrop;
         if (crop && !multiple && dropCrop) {
             var file = files[0];
@@ -444,7 +505,9 @@ var ImageControl = /** @class */ (function (_super) {
         if (event && event.type === 'drop' && this.reuploadIndex !== undefined) {
             this.reuploadIndex = undefined;
         }
-        this.addFiles(files);
+        this.setState({
+            dropMultiple: multiple
+        }, function () { return _this_1.addFiles(files); });
     };
     ImageControl.prototype.handlePaste = function (e) {
         var event = e.nativeEvent;
@@ -493,7 +556,7 @@ var ImageControl = /** @class */ (function (_super) {
         if (!files.length) {
             return;
         }
-        var _a = this.props, multiple = _a.multiple, maxLength = _a.maxLength, maxSize = _a.maxSize; _a.accept; var __ = _a.translate;
+        var _a = this.props, multiple = _a.multiple, maxLength = _a.maxLength, maxSize = _a.maxSize, __ = _a.translate;
         var currentFiles = this.files;
         if (!multiple && currentFiles.length) {
             currentFiles = [];
@@ -616,7 +679,7 @@ var ImageControl = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         if (ret.status && ret.status !== '0') {
-                            throw new Error(ret.msg || __('File.errorRetry'));
+                            throw new Error(ret.msg || __('Image.errorRetry'));
                         }
                         obj = __assign(__assign({}, ret.data), { state: 'uploaded' });
                         obj.value = obj.value || obj.url;
@@ -644,7 +707,7 @@ var ImageControl = /** @class */ (function (_super) {
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
                             return [2 /*return*/];
                         }
-                        cb(error.message || __('File.errorRetry'), file);
+                        cb(error.message || __('Image.errorRetry'), file);
                         return [2 /*return*/];
                 }
             });
@@ -764,7 +827,12 @@ var ImageControl = /** @class */ (function (_super) {
     };
     ImageControl.prototype.validate = function () {
         var _this_1 = this;
-        var __ = this.props.translate;
+        var _a = this.props; _a.translate; var multiple = _a.multiple;
+        if (this.state.error) {
+            this.setState({
+                error: ''
+            });
+        }
         if (this.state.locked && this.state.lockedReason) {
             return this.state.lockedReason;
         }
@@ -781,8 +849,9 @@ var ImageControl = /** @class */ (function (_super) {
                 _this_1.startUpload();
             });
         }
-        else if (this.files.some(function (item) { return item.state === 'error'; })) {
-            return __('File.errorRetry');
+        else if (multiple &&
+            this.files.some(function (i) { return i.state && ['error', 'invalid'].includes(i.state); })) {
+            return ' ';
         }
     };
     ImageControl.prototype.dispatchEvent = function (e, data) {
@@ -813,20 +882,56 @@ var ImageControl = /** @class */ (function (_super) {
     };
     // 重新上传
     ImageControl.prototype.handleReSelect = function (index) {
+        var _this_1 = this;
         this.reuploadIndex = index;
-        this.dropzone.current && this.dropzone.current.open();
+        this.setState({
+            dropMultiple: false
+        }, function () {
+            _this_1.dropzone.current && _this_1.dropzone.current.open();
+        });
     };
     ImageControl.prototype.render = function () {
         var _this_1 = this;
-        var _a = this.props, className = _a.className; _a.style; var cx = _a.classnames, placeholder = _a.placeholder, disabled = _a.disabled, multiple = _a.multiple, accept = _a.accept, maxLength = _a.maxLength, autoUpload = _a.autoUpload, hideUploadButton = _a.hideUploadButton, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, reCropable = _a.reCropable, frameImage = _a.frameImage, fixedSize = _a.fixedSize, fixedSizeClassName = _a.fixedSizeClassName, __ = _a.translate;
-        var _b = this.state, files = _b.files, error = _b.error, crop = _b.crop, uploading = _b.uploading, cropFile = _b.cropFile, frameImageWidth = _b.frameImageWidth;
+        var _a = this.props, className = _a.className, cx = _a.classnames, 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, uploadBtnText = _a.uploadBtnText, maxSize = _a.maxSize, render = _a.render, themeCss = _a.themeCss, inputImageControlClassName = _a.inputImageControlClassName, addBtnControlClassName = _a.addBtnControlClassName, iconControlClassName = _a.iconControlClassName, id = _a.id, __ = _a.translate;
+        insertCustomStyle(themeCss, [
+            {
+                key: 'inputImageControlClassName',
+                value: inputImageControlClassName
+            }
+        ], id, null);
+        insertCustomStyle(themeCss, [
+            {
+                key: 'addBtnControlClassName',
+                value: addBtnControlClassName,
+                weights: {
+                    hover: {
+                        suf: ':not(:disabled):not(.is-disabled)'
+                    },
+                    active: {
+                        suf: ':not(:disabled):not(.is-disabled)'
+                    }
+                }
+            }
+        ], id + '-addOn', null);
+        insertCustomStyle(themeCss, [
+            {
+                key: 'iconControlClassName',
+                value: iconControlClassName,
+                weights: {
+                    default: {
+                        suf: ' svg'
+                    }
+                }
+            }
+        ], id + '-icon', null);
+        var _b = this.state, files = _b.files, error = _b.error, crop = _b.crop, uploading = _b.uploading, cropFile = _b.cropFile, frameImageWidth = _b.frameImageWidth, dropMultiple = _b.dropMultiple;
         var frameImageStyle = {};
         if (fixedSizeClassName && frameImageWidth && fixedSize) {
             frameImageStyle.width = frameImageWidth;
         }
         var filterFrameImage = filter(frameImage, this.props.data, '| raw');
         var hasPending = files.some(function (file) { return file.state == 'pending'; });
-        return (React.createElement("div", { className: cx("ImageControl", className) }, cropFile ? (React.createElement("div", { className: cx('ImageControl-cropperWrapper') },
+        return (React.createElement("div", { className: cx("ImageControl", className, inputImageControlClassName) }, cropFile ? (React.createElement("div", { className: cx('ImageControl-cropperWrapper') },
             React.createElement(Suspense, { fallback: React.createElement("div", null, "...") },
                 React.createElement(Cropper, __assign({}, crop, { onInitialized: function (instance) {
                         _this_1.cropper = instance;
@@ -837,8 +942,8 @@ var ImageControl = /** @class */ (function (_super) {
                 React.createElement("a", { className: cx('ImageControl-cropCancel'), onClick: this.cancelCrop, "data-tooltip": __('cancel'), "data-position": "left" },
                     React.createElement(Icon, { icon: "close", className: "icon" })),
                 React.createElement("a", { className: cx('ImageControl-cropConfirm'), onClick: this.handleCrop, "data-tooltip": __('confirm'), "data-position": "left" },
-                    React.createElement(Icon, { icon: "check", className: "icon" }))))) : (React.createElement(DropZone, { key: "drop-zone", ref: this.dropzone, onDrop: this.handleDrop, onDropRejected: this.handleDropRejected, accept: accept, multiple: multiple, disabled: disabled }, function (_a) {
-            var getRootProps = _a.getRootProps, getInputProps = _a.getInputProps, isDragActive = _a.isDragActive, isDragAccept = _a.isDragAccept, isDragReject = _a.isDragReject, isFocused = _a.isFocused;
+                    React.createElement(Icon, { icon: "check", className: "icon" }))))) : (React.createElement(DropZone, { key: "drop-zone", ref: this.dropzone, onDrop: this.handleDrop, onDropRejected: this.handleDropRejected, onFileDialogCancel: this.handleFileCancel, accept: accept, multiple: dropMultiple, disabled: disabled, maxSize: maxSize }, function (_a) {
+            var getRootProps = _a.getRootProps, getInputProps = _a.getInputProps, isDragActive = _a.isDragActive, isDragAccept = _a.isDragAccept, isDragReject = _a.isDragReject;
             return (React.createElement("div", __assign({}, getRootProps({
                 onClick: preventEvent,
                 onPaste: _this_1.handlePaste,
@@ -859,18 +964,23 @@ var ImageControl = /** @class */ (function (_super) {
                                 'is-invalid': file.state === 'error' ||
                                     file.state === 'invalid'
                             }, fixedSize ? 'ImageControl-fixed-size' : '', fixedSize ? fixedSizeClassName : ''), style: frameImageStyle }, file.state === 'invalid' ||
-                            file.state === 'error' ? (React.createElement("div", { className: cx('Image--thumb') },
-                            React.createElement("div", { className: cx('Image-thumbWrap') },
-                                React.createElement("div", { className: cx('Image-thumb', 'ImageControl-filename') },
-                                    React.createElement(Icon, { icon: "image", className: "icon" }),
-                                    React.createElement("span", { title: file.name ||
-                                            getNameFromUrl(file.value || file.url) }, file.name ||
-                                        getNameFromUrl(file.value || file.url))),
-                                React.createElement("div", { className: cx('Image-overlay') },
-                                    React.createElement("a", { "data-tooltip": __('File.repick'), "data-position": "bottom", onClick: _this_1.handleRetry.bind(_this_1, key) },
-                                        React.createElement(Icon, { icon: "upload", className: "icon" })),
-                                    !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)))) : file.state === 'uploading' ? (React.createElement(React.Fragment, null,
+                            file.state === 'error' ? (React.createElement(TooltipWrapper, { placement: "top", tooltip: {
+                                content: file.error,
+                                disabled: !multiple && files.length === 1,
+                                tooltipBodyClassName: cx('ImageControl-item-errorTip')
+                            }, trigger: "hover" },
+                            React.createElement("div", { className: cx('Image--thumb') },
+                                React.createElement("div", { className: cx('Image-thumbWrap') },
+                                    React.createElement("div", { className: cx('Image-thumb', 'ImageControl-filename') },
+                                        React.createElement(Icon, { icon: "image", className: "icon" }),
+                                        React.createElement("span", { title: file.name ||
+                                                getNameFromUrl(file.value || file.url) }, file.name ||
+                                            getNameFromUrl(file.value || file.url))),
+                                    React.createElement("div", { className: cx('Image-overlay') },
+                                        React.createElement("a", { "data-tooltip": __('File.repick'), "data-position": "bottom", onClick: _this_1.handleReSelect.bind(_this_1, key) },
+                                            React.createElement(Icon, { icon: "upload", className: "icon" })),
+                                        !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))))) : file.state === 'uploading' ? (React.createElement(React.Fragment, null,
                             React.createElement("a", { onClick: _this_1.removeFile.bind(_this_1, file, key), key: "clear", className: cx('ImageControl-itemClear'), "data-tooltip": __('Select.clear') },
                                 React.createElement(Icon, { icon: "close", className: "icon" })),
                             React.createElement("div", { key: "info", className: cx('ImageControl-itemInfo', fixedSize ? 'ImageControl-fixed-size' : '', fixedSize ? fixedSizeClassName : '') },
@@ -894,13 +1004,19 @@ var ImageControl = /** @class */ (function (_super) {
                                         React.createElement(Icon, { icon: "remove", className: "icon" }))) : null) }))))); })
                         : null,
                     (multiple && (!maxLength || files.length < maxLength)) ||
-                        (!multiple && !files.length) ? (React.createElement("label", { className: cx('ImageControl-addBtn', {
-                            'is-disabled': disabled
-                        }, fixedSize ? 'ImageControl-fixed-size' : '', fixedSize ? fixedSizeClassName : ''), style: frameImageStyle, onClick: _this_1.handleSelect, "data-tooltip": __(placeholder), "data-position": "right", ref: _this_1.frameImageRef },
-                        filterFrameImage ? (React.createElement(ThemedImageThumb, { key: "upload-default-image", src: filterFrameImage, className: cx(fixedSize ? 'Image-thumb--fixed-size' : ''), onLoad: _this_1.handleFrameImageLoaded.bind(_this_1), thumbMode: thumbMode, thumbRatio: thumbRatio })) : (React.createElement(React.Fragment, null,
-                            React.createElement(Icon, { icon: "plus-fine", className: "icon" }),
-                            React.createElement("span", { className: cx('ImageControl-addBtn-text') }, __('Image.upload')))),
-                        isFocused ? (React.createElement("span", { className: cx('ImageControl-pasteTip') }, __('Image.pasteTip'))) : null)) : null,
+                        (!multiple && !files.length) ? (React.createElement(TooltipWrapper, { placement: "top", trigger: "hover", tooltip: {
+                            content: error,
+                            disabled: !multiple || !error
+                        } },
+                        React.createElement("label", { className: cx('ImageControl-addBtn', {
+                                'is-disabled': disabled
+                            }, fixedSize ? 'ImageControl-fixed-size' : '', fixedSize ? fixedSizeClassName : '', addBtnControlClassName, error ? 'is-invalid' : ''), style: frameImageStyle, onClick: _this_1.handleSelect, ref: _this_1.frameImageRef },
+                            React.createElement(Icon, { icon: "plus-fine", className: "icon", iconContent: cx(':ImageControl-addBtn-icon', iconControlClassName) }),
+                            React.createElement("span", { className: cx('ImageControl-addBtn-text') }, !uploadBtnText
+                                ? __('Image.upload')
+                                : render("btn-upload-text", uploadBtnText, {})),
+                            filterFrameImage ? (React.createElement("div", { className: cx('ImageControl-addBtn-bg') },
+                                React.createElement(ThemedImageThumb, { key: "upload-default-image", src: filterFrameImage, className: cx(fixedSize ? 'Image-thumb--fixed-size' : ''), onLoad: _this_1.handleFrameImageLoaded.bind(_this_1), thumbMode: thumbMode, thumbRatio: thumbRatio }))) : null))) : null,
                     !autoUpload && !hideUploadButton && files.length ? (React.createElement(Button, { level: "default", className: cx('ImageControl-uploadBtn'), disabled: !hasPending, onClick: _this_1.toggleUpload }, __(uploading ? 'File.pause' : 'File.start'))) : null,
                     error ? (React.createElement("div", { className: cx('ImageControl-errorMsg') }, error)) : null))));
         }))));
@@ -911,6 +1027,7 @@ var ImageControl = /** @class */ (function (_super) {
         receiver: '/api/upload',
         hideUploadButton: false,
         placeholder: 'Image.placeholder',
+        placeholderPlacement: 'top',
         joinValues: true,
         extractValue: false,
         delimiter: ',',

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

@@ -1,8 +1,7 @@
-/// <reference types="react" />
 import InputDateRange, { DateRangeControlSchema } from './InputDateRange';
 /**
  * MonthRange 月范围控件
- * 文档：https://baidu.gitee.io/amis/docs/components/form/month-range
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/month-range
  */
 export interface MonthRangeControlSchema extends Omit<DateRangeControlSchema, 'type'> {
     type: 'input-month-range';

package/esm/renderers/Form/InputMonthRange.js

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

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

@@ -4,7 +4,7 @@ import { Option, PlainObject, ActionObject } from 'amis-core';
 import { FormBaseControlSchema } from '../../Schema';
 /**
  * 数字输入框
- * 文档：https://baidu.gitee.io/amis/docs/components/form/number
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/number
  */
 export interface NumberControlSchema extends FormBaseControlSchema {
     type: 'input-number';
@@ -135,7 +135,6 @@ export default class NumberControl extends React.Component<NumberProps, NumberSt
     componentDidUpdate(prevProps: NumberProps): void;
     inputRef(ref: any): void;
     focus(): void;
-    renderStatic(displayValue?: string): string | JSX.Element;
     render(): JSX.Element;
 }
 export declare class NumberControlRenderer extends NumberControl {

package/esm/renderers/Form/InputNumber.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
 import { __extends, __values, __awaiter, __generator, __decorate, __metadata, __assign } from 'tslib';
 import React from 'react';
 import { toFixed } from '@rc-component/mini-decimal';
-import { normalizeOptions, resolveEventData, filter, autobind, FormItem } from 'amis-core';
+import { normalizeOptions, resolveEventData, filter, insertCustomStyle, autobind, FormItem } from 'amis-core';
 import cx from 'classnames';
 import { NumberInput, Select } from 'amis-ui';
 import { supportStatic } from './StaticHoc.js';
@@ -107,7 +107,7 @@ var NumberControl = /** @class */ (function (_super) {
             var _a, dispatchEvent, value;
             return __generator(this, function (_b) {
                 _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
-                dispatchEvent(eventName, resolveEventData(this.props, { value: value }, 'value'));
+                dispatchEvent(eventName, resolveEventData(this.props, { value: value }));
                 return [2 /*return*/];
             });
         });
@@ -121,7 +121,7 @@ var NumberControl = /** @class */ (function (_super) {
                         _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent, clearValueOnEmpty = _a.clearValueOnEmpty;
                         value = this.getValue(inputValue);
                         resultValue = clearValueOnEmpty && value === '' ? undefined : value;
-                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: resultValue }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: resultValue }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -178,31 +178,11 @@ var NumberControl = /** @class */ (function (_super) {
         }
         this.input.focus();
     };
-    NumberControl.prototype.renderStatic = function (displayValue) {
-        var _a;
-        if (displayValue === void 0) { displayValue = '-'; }
-        var _b = this.props, value = _b.value, kilobitSeparator = _b.kilobitSeparator, prefix = _b.prefix, suffix = _b.suffix;
-        if (value == null) {
-            return displayValue;
-        }
-        var unit = ((_a = this.state) === null || _a === void 0 ? void 0 : _a.unit) || '';
-        // 处理单位
-        var finalValue = unit && value && typeof value === 'string'
-            ? value.replace(unit, '')
-            : value;
-        // 增加千分分隔
-        if (kilobitSeparator && finalValue) {
-            finalValue = numberFormatter.format(finalValue);
-        }
-        // 增加前后缀
-        finalValue = (prefix ? prefix : '') + finalValue + (suffix ? suffix : '');
-        return React.createElement(React.Fragment, null, finalValue + unit);
-    };
     NumberControl.prototype.render = function () {
         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, clearValueOnEmpty = _c.clearValueOnEmpty;
+        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, css = _c.css, themeCss = _c.themeCss, inputControlClassName = _c.inputControlClassName, id = _c.id;
         var finalPrecision = this.filterNum(precision);
         var unit = (_b = this.state) === null || _b === void 0 ? void 0 : _b.unit;
         // 数据格式化
@@ -225,11 +205,24 @@ var NumberControl = /** @class */ (function (_super) {
         var finalValue = unit && value && typeof value === 'string'
             ? value.replace(unit, '')
             : value;
+        insertCustomStyle(themeCss || css, [
+            {
+                key: 'inputControlClassName',
+                value: inputControlClassName,
+                weights: {
+                    active: {
+                        pre: "".concat(inputControlClassName, ".focused, ")
+                    }
+                }
+            }
+        ], id);
         return (React.createElement("div", { className: cx("".concat(ns, "NumberControl"), (_a = {},
                 _a["".concat(ns, "NumberControl--withUnit")] = unitOptions,
                 _a), className) },
-            React.createElement(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.createElement(Select, { value: unit, clearable: false, options: this.state.unitOptions || [], onChange: this.handleChangeUnit })) : null));
+            React.createElement(NumberInput, { inputControlClassName: inputControlClassName, 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 }),
+            Array.isArray(unitOptions) && unitOptions.length !== 0 ? (unitOptions.length > 1 ? (React.createElement(Select, { value: unit, clearable: false, options: this.state.unitOptions || [], onChange: this.handleChangeUnit, className: "".concat(ns, "NumberControl-unit") })) : (React.createElement("div", { className: cx("".concat(ns, "NumberControl-unit"), " ".concat(ns, "NumberControl-single-unit"), "".concat(ns, "Select")) }, typeof unitOptions[0] === 'string'
+                ? unitOptions[0]
+                : unitOptions[0].label))) : null));
     };
     NumberControl.defaultProps = {
         step: 1,

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

@@ -1,8 +1,7 @@
-/// <reference types="react" />
 import InputDateRange, { DateRangeControlSchema } from './InputDateRange';
 /**
  * QuarterRange 季度范围控件
- * 文档：https://baidu.gitee.io/amis/docs/components/form/input-quarter-range
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/input-quarter-range
  */
 export interface QuarterRangeControlSchema extends Omit<DateRangeControlSchema, 'type'> {
     type: 'input-quarter-range';

package/esm/renderers/Form/InputQuarterRange.js

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

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

@@ -3,7 +3,7 @@ import { FormControlProps, ActionObject } from 'amis-core';
 import { FormBaseControlSchema, SchemaObject } from '../../Schema';
 /**
  * Range
- * 文档：https://baidu.gitee.io/amis/docs/components/form/range
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/range
  */
 export type Value = string | MultipleValue | number | [number, number];
 export type FormatValue = MultipleValue | number;

package/esm/renderers/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -143,7 +143,7 @@ var Input = /** @class */ (function (_super) {
                         _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, onBlur = _a.onBlur;
                         return [4 /*yield*/, dispatchEvent('blur', resolveEventData(this.props, {
                                 value: value
-                            }, 'value'))];
+                            }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -167,7 +167,7 @@ var Input = /** @class */ (function (_super) {
                         _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, onFocus = _a.onFocus;
                         return [4 /*yield*/, dispatchEvent('focus', resolveEventData(this.props, {
                                 value: value
-                            }, 'value'))];
+                            }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -289,7 +289,7 @@ var RangeControl = /** @class */ (function (_super) {
                         result = this.getFormatValue(value);
                         return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, {
                                 value: result
-                            }, 'value'))];
+                            }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

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

@@ -5,7 +5,7 @@ import type { textPositionType } from 'amis-ui/lib/components/Rating';
 import { FormBaseControlSchema } from '../../Schema';
 /**
  * Rating
- * 文档：https://baidu.gitee.io/amis/docs/components/form/rating
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/rating
  */
 export interface RatingControlSchema extends FormBaseControlSchema {
     type: 'input-rating';

package/esm/renderers/Form/InputRating.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -31,7 +31,7 @@ var RatingControl = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
-                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {