amis 2.5.3-beta.0 → 2.5.3-beta.3

package/lib/renderers/Form/InputExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -33,7 +33,7 @@ var ExcelControl = /** @class */ (function (_super) {
     };
     ExcelControl.prototype.handleDrop = function (files) {
         var _this = this;
-        var _a = this.props, allSheets = _a.allSheets, onChange = _a.onChange; _a.dispatchEvent;
+        var _a = this.props, allSheets = _a.allSheets, onChange = _a.onChange, parseImage = _a.parseImage;
         var excel = files[0];
         var reader = new FileReader();
         reader.readAsArrayBuffer(excel);
@@ -42,7 +42,7 @@ var ExcelControl = /** @class */ (function (_super) {
             return tslib.__generator(this, function (_a) {
                 if (reader.result) {
                     Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['exceljs'], function(mod) {fullfill(tslib.__importStar(mod))})})}).then(function (ExcelJS) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                        var workbook, sheetsResult, worksheet, dispatcher;
+                        var workbook, sheetsResult, worksheet, images, dispatcher;
                         var _this = this;
                         return tslib.__generator(this, function (_a) {
                             switch (_a.label) {
@@ -55,15 +55,33 @@ var ExcelControl = /** @class */ (function (_super) {
                                     sheetsResult = [];
                                     if (allSheets) {
                                         workbook.eachSheet(function (worksheet) {
-                                            sheetsResult.push({
-                                                sheetName: worksheet.name,
-                                                data: _this.readWorksheet(worksheet)
-                                            });
+                                            if (parseImage) {
+                                                sheetsResult.push({
+                                                    sheetName: worksheet.name,
+                                                    data: _this.readWorksheet(worksheet),
+                                                    images: _this.readImages(worksheet, workbook)
+                                                });
+                                            }
+                                            else {
+                                                sheetsResult.push({
+                                                    sheetName: worksheet.name,
+                                                    data: _this.readWorksheet(worksheet)
+                                                });
+                                            }
                                         });
                                     }
                                     else {
                                         worksheet = workbook.worksheets[0];
-                                        sheetsResult = this.readWorksheet(worksheet);
+                                        if (parseImage) {
+                                            images = this.readImages(worksheet, workbook);
+                                            sheetsResult = {
+                                                data: this.readWorksheet(worksheet),
+                                                images: images
+                                            };
+                                        }
+                                        else {
+                                            sheetsResult = this.readWorksheet(worksheet);
+                                        }
                                     }
                                     return [4 /*yield*/, this.dispatchEvent('change', sheetsResult)];
                                 case 2:
@@ -82,6 +100,29 @@ var ExcelControl = /** @class */ (function (_super) {
             });
         }); };
     };
+    /** 读取工作表里的图片 */
+    ExcelControl.prototype.readImages = function (worksheet, workbook) {
+        var imageDataURI = this.props.imageDataURI;
+        var images = worksheet.getImages();
+        var imgResult = [];
+        for (var _i = 0, images_1 = images; _i < images_1.length; _i++) {
+            var image = images_1[_i];
+            var img = workbook.getImage(+image.imageId);
+            var imgBase64 = this.encodeBase64Bytes(img.buffer);
+            if (imageDataURI) {
+                var extension = img.extension || 'png';
+                imgResult.push("data:image/".concat(extension, ";base64,") + imgBase64);
+            }
+            else {
+                imgResult.push(imgBase64);
+            }
+        }
+        return imgResult;
+    };
+    /** 将 buffer 转成 base64 */
+    ExcelControl.prototype.encodeBase64Bytes = function (bytes) {
+        return btoa(bytes.reduce(function (acc, current) { return acc + String.fromCharCode(current); }, ''));
+    };
     ExcelControl.prototype.dispatchEvent = function (eventName, eventData) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, dispatchEvent;
@@ -238,7 +279,9 @@ var ExcelControl = /** @class */ (function (_super) {
         allSheets: false,
         parseMode: 'object',
         includeEmpty: true,
-        plainText: true
+        plainText: true,
+        parseImage: false,
+        imageDataURI: true
     };
     tslib.__decorate([
         amisCore.autobind,

package/lib/renderers/Form/InputFile.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -414,7 +414,7 @@ var FileControl = /** @class */ (function (_super) {
                         }
                         onProgress(1);
                         value = ret.data.value || ret.data.url || ret.data;
-                        return [4 /*yield*/, this.dispatchEvent('success', tslib.__assign(tslib.__assign({}, file), { item: file, value: value }))];
+                        return [4 /*yield*/, this.dispatchEvent('success', tslib.__assign(tslib.__assign({}, file), { item: tslib.__assign(tslib.__assign({}, file), ret.data), value: value }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {

package/lib/renderers/Form/InputFormula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

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

@@ -298,7 +298,7 @@ export default class ImageControl extends React.Component<ImageProps, ImageState
     removeFile(file: FileValue, index: number): Promise<void>;
     previewImage(file: FileX, index: number, e: React.MouseEvent<any>): void;
     editImage(index: number): void;
-    onChange(changeImmediately?: boolean, changeEvent?: boolean): Promise<void>;
+    onChange(changeImmediately?: boolean, changeEvent?: boolean, initAutoFill?: boolean): Promise<void>;
     syncAutoFill(): void;
     handleSelect(): void;
     handleRetry(index: number): void;

package/lib/renderers/Form/InputImage.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -37,7 +37,9 @@ var preventEvent = function (e) { return e.stopPropagation(); };
 var ImageControl = /** @class */ (function (_super) {
     tslib.__extends(ImageControl, _super);
     function ImageControl(props) {
-        var _this_1 = _super.call(this, props) || this;
+        var _this_1 = this;
+        var _a;
+        _this_1 = _super.call(this, props) || this;
         _this_1.state = {
             uploading: false,
             locked: false,
@@ -56,7 +58,7 @@ var ImageControl = /** @class */ (function (_super) {
         var joinValues = props.joinValues;
         var delimiter = props.delimiter;
         var files = [];
-        _this_1.initAutoFill = !!props.initAutoFill;
+        _this_1.initAutoFill = !!((_a = props.initAutoFill) !== null && _a !== void 0 ? _a : true);
         if (value) {
             // files = (multiple && Array.isArray(value) ? value : joinValues ? (value as string).split(delimiter) : [value])
             files = (Array.isArray(value)
@@ -149,11 +151,7 @@ var ImageControl = /** @class */ (function (_super) {
             }
             this.setState({
                 files: (this.files = files)
-            }, this.syncAutoFill);
-        }
-        else if (prevProps.value !== props.value && !this.initAutoFill) {
-            this.initAutoFill = true;
-            this.syncAutoFill();
+            }, this.initAutoFill ? this.syncAutoFill : function () { });
         }
         if (prevProps.crop !== props.crop) {
             this.setState({
@@ -359,14 +357,15 @@ var ImageControl = /** @class */ (function (_super) {
             cropFileName: files[index].name
         });
     };
-    ImageControl.prototype.onChange = function (changeImmediately, changeEvent) {
+    ImageControl.prototype.onChange = function (changeImmediately, changeEvent, initAutoFill) {
         if (changeEvent === void 0) { changeEvent = true; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, multiple, onChange, joinValues, extractValue, delimiter, valueField, files, newValue, dispatcher;
+            var _a, multiple, onChange, joinValues, extractValue, delimiter, valueField, curInitAutoFill, files, newValue, dispatcher;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, multiple = _a.multiple, onChange = _a.onChange, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, valueField = _a.valueField;
+                        curInitAutoFill = initAutoFill !== null && initAutoFill !== void 0 ? initAutoFill : true;
                         files = this.files.filter(function (file) { return file.state == 'uploaded' || file.state == 'init'; });
                         newValue = files.length
                             ? joinValues
@@ -397,7 +396,7 @@ var ImageControl = /** @class */ (function (_super) {
                         _b.label = 2;
                     case 2:
                         onChange((this.emitValue = newValue || ''), undefined, changeImmediately);
-                        this.syncAutoFill();
+                        curInitAutoFill && this.syncAutoFill();
                         return [2 /*return*/];
                 }
             });
@@ -635,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: file, value: obj.value }))];
+                        return [4 /*yield*/, this.dispatchEvent('success', tslib.__assign(tslib.__assign({}, file), { item: tslib.__assign(tslib.__assign({}, file), ret.data), value: obj.value }))];
                     case 1:
                         dispatcher = _a.sent();
                         if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
@@ -755,7 +754,11 @@ var ImageControl = /** @class */ (function (_super) {
             _this_1.unmounted ||
                 _this_1.setState({
                     files: (_this_1.files = files)
-                }, !needUploading ? _this_1.onChange : undefined);
+                }, function () {
+                    if (!needUploading) {
+                        _this_1.onChange(false, true, _this_1.initAutoFill);
+                    }
+                });
         };
         img.src = imgDom.src;
     };

package/lib/renderers/Form/InputMonthRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

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

@@ -131,7 +131,7 @@ export default class NumberControl extends React.Component<NumberProps, NumberSt
     componentDidUpdate(prevProps: NumberProps): void;
     inputRef(ref: any): void;
     focus(): void;
-    renderStatic(displayValue?: string): JSX.Element;
+    renderStatic(displayValue?: string): string | JSX.Element;
     render(): JSX.Element;
 }
 export declare class NumberControlRenderer extends NumberControl {

package/lib/renderers/Form/InputNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -20,6 +20,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
+var numberFormatter = new Intl.NumberFormat();
 var NumberControl = /** @class */ (function (_super) {
     tslib.__extends(NumberControl, _super);
     function NumberControl(props) {
@@ -176,12 +177,24 @@ var NumberControl = /** @class */ (function (_super) {
         this.input.focus();
     };
     NumberControl.prototype.renderStatic = function (displayValue) {
+        var _a;
         if (displayValue === void 0) { displayValue = '-'; }
-        var _a = this.props, unit = _a.unit, value = _a.value;
+        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;
-        return React__default["default"].createElement(React__default["default"].Fragment, null, finalValue || displayValue);
+        // 增加千分分隔
+        if (kilobitSeparator && finalValue) {
+            finalValue = numberFormatter.format(finalValue);
+        }
+        // 增加前后缀
+        finalValue = (prefix ? prefix : '') + finalValue + (suffix ? suffix : '');
+        return React__default["default"].createElement(React__default["default"].Fragment, null, finalValue + unit);
     };
     NumberControl.prototype.render = function () {
         var _a;
@@ -194,7 +207,7 @@ var NumberControl = /** @class */ (function (_super) {
         var formatter = function (value) {
             // 增加千分分隔
             if (kilobitSeparator && value) {
-                value = (value + '').replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+                value = numberFormatter.format(value);
             }
             return (prefix ? prefix : '') + value + (suffix ? suffix : '');
         };

package/lib/renderers/Form/InputQuarterRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRating.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRepeat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRichText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { OptionsControlProps, Option } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { ActionObject } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 import { TooltipWrapperSchema } from '../TooltipWrapper';
@@ -43,7 +44,7 @@ export interface TagControlSchema extends FormOptionsSchema {
     separator?: string;
 }
 export type InputTagValidationType = 'max' | 'maxLength';
-export interface TagProps extends OptionsControlProps {
+export interface TagProps extends OptionsControlProps, SpinnerExtraProps {
     placeholder?: string;
     clearable: boolean;
     resetValue?: any;

package/lib/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -329,7 +329,7 @@ var TagControl = /** @class */ (function (_super) {
     };
     TagControl.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className; _a.style; var cx = _a.classnames, disabled = _a.disabled, placeholder = _a.placeholder, name = _a.name, clearable = _a.clearable, selectedOptions = _a.selectedOptions, loading = _a.loading, popOverContainer = _a.popOverContainer, dropdown = _a.dropdown, options = _a.options, optionsTip = _a.optionsTip, maxTagCount = _a.maxTagCount, overflowTagPopover = _a.overflowTagPopover, __ = _a.translate;
+        var _a = this.props, className = _a.className; _a.style; var cx = _a.classnames, disabled = _a.disabled, placeholder = _a.placeholder, name = _a.name, clearable = _a.clearable, selectedOptions = _a.selectedOptions, loading = _a.loading, popOverContainer = _a.popOverContainer, dropdown = _a.dropdown, options = _a.options, optionsTip = _a.optionsTip, maxTagCount = _a.maxTagCount, overflowTagPopover = _a.overflowTagPopover, __ = _a.translate, loadingConfig = _a.loadingConfig;
         var finnalOptions = Array.isArray(options)
             ? amisCore.filterTree(options, function (item) {
                 return (Array.isArray(item.children) && !!item.children.length) ||
@@ -349,7 +349,7 @@ var TagControl = /** @class */ (function (_super) {
                     onFocus: _this.handleFocus,
                     onBlur: _this.handleBlur,
                     disabled: disabled
-                }), { inputPlaceholder: '', onChange: _this.handleInputChange, className: cx('TagControl-input'), result: selectedOptions, onResultChange: _this.handleChange, itemRender: _this.renderItem, clearable: clearable, maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, allowInput: true }), loading ? React__default["default"].createElement(amisUi.Spinner, { size: "sm" }) : undefined),
+                }), { inputPlaceholder: '', onChange: _this.handleInputChange, className: cx('TagControl-input'), result: selectedOptions, onResultChange: _this.handleChange, itemRender: _this.renderItem, clearable: clearable, maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, allowInput: true }), loading ? (React__default["default"].createElement(amisUi.Spinner, { loadingConfig: loadingConfig, size: "sm" })) : undefined),
                 dropdown !== false ? (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer || _this.getParent, target: _this.getTarget, placement: 'auto', show: isOpen && !!finnalOptions.length },
                     React__default["default"].createElement(amisCore.PopOver, { overlay: true, className: cx('TagControl-popover'), onHide: _this.close },
                         React__default["default"].createElement(amisUi.ListMenu, { options: finnalOptions, itemRender: _this.renderItem, highlightIndex: highlightedIndex, getItemProps: function (_a) {

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { OptionsControlProps } from 'amis-core';
 import { ActionObject } from 'amis-core';
 import { StateChangeOptions } from 'downshift';
+import { SpinnerExtraProps } from 'amis-ui';
 import { ActionSchema } from '../Action';
 import { FormOptionsSchema, SchemaApi } from '../../Schema';
 import type { Option } from 'amis-core';
@@ -68,7 +69,7 @@ export interface TextControlSchema extends FormOptionsSchema {
     clearValueOnEmpty?: boolean;
 }
 export type InputTextRendererEvent = 'blur' | 'focus' | 'click' | 'change' | 'enter';
-export interface TextProps extends OptionsControlProps {
+export interface TextProps extends OptionsControlProps, SpinnerExtraProps {
     placeholder?: string;
     addOn?: ActionObject & {
         position?: 'left' | 'right';

package/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -456,7 +456,7 @@ var TextControl = /** @class */ (function (_super) {
     TextControl.prototype.renderSugestMode = function () {
         var _this = this;
         var _a;
-        var _b = this.props, className = _b.className; _b.style; var inputControlClassName = _b.inputControlClassName, nativeInputClassName = _b.nativeInputClassName, inputOnly = _b.inputOnly, value = _b.value, placeholder = _b.placeholder, cx = _b.classnames, disabled = _b.disabled, readOnly = _b.readOnly, name = _b.name, loading = _b.loading, clearable = _b.clearable, options = _b.options, selectedOptions = _b.selectedOptions, autoComplete = _b.autoComplete, labelField = _b.labelField, valueField = _b.valueField, multiple = _b.multiple, creatable = _b.creatable, borderMode = _b.borderMode, showCounter = _b.showCounter, maxLength = _b.maxLength, minLength = _b.minLength, __ = _b.translate;
+        var _b = this.props, className = _b.className; _b.style; var inputControlClassName = _b.inputControlClassName, nativeInputClassName = _b.nativeInputClassName, inputOnly = _b.inputOnly, value = _b.value, placeholder = _b.placeholder, cx = _b.classnames, disabled = _b.disabled, readOnly = _b.readOnly, name = _b.name, loading = _b.loading, clearable = _b.clearable, options = _b.options, selectedOptions = _b.selectedOptions, autoComplete = _b.autoComplete, labelField = _b.labelField, valueField = _b.valueField, multiple = _b.multiple, creatable = _b.creatable, borderMode = _b.borderMode, showCounter = _b.showCounter, maxLength = _b.maxLength, minLength = _b.minLength, __ = _b.translate, loadingConfig = _b.loadingConfig;
         var type = (_a = this.props.type) === null || _a === void 0 ? void 0 : _a.replace(/^(?:native|input)\-/, '');
         return (React__default["default"].createElement(Downshift__default["default"], { isOpen: this.state.isOpen && !disabled && !readOnly, inputValue: this.state.inputValue, onChange: this.handleChange, onStateChange: this.handleStateChange, selectedItem: selectedOptions.map(function (item) { return item[valueField || 'value']; }) }, function (_a) {
             var _b, _c;
@@ -516,7 +516,7 @@ var TextControl = /** @class */ (function (_super) {
                 showCounter ? (React__default["default"].createElement("span", { className: cx('TextControl-counter') }, "".concat((_d = _this.valueToString(value)) === null || _d === void 0 ? void 0 : _d.length).concat(typeof maxLength === 'number' && maxLength
                     ? "/".concat(maxLength)
                     : ''))) : null,
-                loading ? (React__default["default"].createElement(amisUi.Spinner, { show: true, icon: "reload", size: "sm", spinnerClassName: cx('TextControl-spinner') })) : null,
+                loading ? (React__default["default"].createElement(amisUi.Spinner, { show: true, icon: "reload", size: "sm", spinnerClassName: cx('TextControl-spinner'), loadingConfig: loadingConfig })) : null,
                 isOpen && filtedOptions.length ? (React__default["default"].createElement("div", { className: cx('TextControl-sugs') }, filtedOptions.map(function (option) {
                     var label = option[labelField || 'label'];
                     var value = option[valueField || 'value'];

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import { SpinnerExtraProps } from 'amis-ui';
 import { OptionsControlProps, ActionObject } from 'amis-core';
 import { FormOptionsSchema, SchemaApi } from '../../Schema';
 /**
@@ -69,7 +70,7 @@ export interface TreeControlSchema extends FormOptionsSchema {
      */
     highlightTxt?: string;
 }
-export interface TreeProps extends OptionsControlProps, Omit<TreeControlSchema, 'type' | 'options' | 'className' | 'inputClassName' | 'descriptionClassName' | 'deferApi'> {
+export interface TreeProps extends OptionsControlProps, Omit<TreeControlSchema, 'type' | 'options' | 'className' | 'inputClassName' | 'descriptionClassName' | 'deferApi'>, SpinnerExtraProps {
     enableNodePath?: boolean;
     pathSeparator?: string;
 }

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -80,13 +80,13 @@ var TreeControl = /** @class */ (function (_super) {
         }
     };
     TreeControl.prototype.render = function () {
-        var _a = this.props, className = _a.className; _a.style; var treeContainerClassName = _a.treeContainerClassName, ns = _a.classPrefix, value = _a.value, enableNodePath = _a.enableNodePath, _b = _a.pathSeparator, pathSeparator = _b === void 0 ? '/' : _b, disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, placeholder = _a.placeholder, options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, loading = _a.loading, hideRoot = _a.hideRoot, rootLabel = _a.rootLabel, autoCheckChildren = _a.autoCheckChildren, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio, showOutline = _a.showOutline, onAdd = _a.onAdd, creatable = _a.creatable, createTip = _a.createTip, addControls = _a.addControls, onEdit = _a.onEdit, editable = _a.editable, editTip = _a.editTip, editControls = _a.editControls, removable = _a.removable, removeTip = _a.removeTip, onDelete = _a.onDelete, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, labelField = _a.labelField, iconField = _a.iconField, nodePath = _a.nodePath, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, __ = _a.translate, data = _a.data, virtualThreshold = _a.virtualThreshold, itemHeight = _a.itemHeight;
+        var _a = this.props, className = _a.className; _a.style; var treeContainerClassName = _a.treeContainerClassName, ns = _a.classPrefix, value = _a.value, enableNodePath = _a.enableNodePath, _b = _a.pathSeparator, pathSeparator = _b === void 0 ? '/' : _b, disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, placeholder = _a.placeholder, options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, loading = _a.loading, hideRoot = _a.hideRoot, rootLabel = _a.rootLabel, autoCheckChildren = _a.autoCheckChildren, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio, showOutline = _a.showOutline, onAdd = _a.onAdd, creatable = _a.creatable, createTip = _a.createTip, addControls = _a.addControls, onEdit = _a.onEdit, editable = _a.editable, editTip = _a.editTip, editControls = _a.editControls, removable = _a.removable, removeTip = _a.removeTip, onDelete = _a.onDelete, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, labelField = _a.labelField, iconField = _a.iconField, nodePath = _a.nodePath, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, __ = _a.translate, data = _a.data, virtualThreshold = _a.virtualThreshold, itemHeight = _a.itemHeight, loadingConfig = _a.loadingConfig;
         var highlightTxt = this.props.highlightTxt;
         if (amisCore.isPureVariable(highlightTxt)) {
             highlightTxt = amisCore.resolveVariableAndFilter(highlightTxt, data);
         }
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "TreeControl"), className, treeContainerClassName) },
-            React__default["default"].createElement(amisUi.Spinner, { size: "sm", key: "info", show: loading }),
+            React__default["default"].createElement(amisUi.Spinner, { size: "sm", key: "info", show: loading, loadingConfig: loadingConfig }),
             loading ? null : (React__default["default"].createElement(amisUi.Tree, { classPrefix: ns, onRef: this.domRef, labelField: labelField, valueField: valueField, iconField: iconField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(placeholder), options: options, highlightTxt: highlightTxt, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, hideRoot: hideRoot, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, autoCheckChildren: autoCheckChildren, cascade: cascade, foldedField: "collapsed", value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, selfDisabledAffectChildren: false, onAdd: onAdd, creatable: creatable, createTip: createTip, rootCreatable: rootCreatable, rootCreateTip: rootCreateTip, onEdit: onEdit, editable: editable, editTip: editTip, removable: removable, removeTip: removeTip, onDelete: onDelete, bultinCUD: !addControls && !editControls, onDeferLoad: deferLoad, onExpandTree: expandTreeOptions, virtualThreshold: virtualThreshold, itemHeight: amisCore.toNumber(itemHeight) > 0 ? amisCore.toNumber(itemHeight) : undefined }))));
     };
     TreeControl.defaultProps = {

package/lib/renderers/Form/InputYearRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchemaEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ListSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/LocationPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 

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

@@ -4,6 +4,7 @@
  */
 import React from 'react';
 import { FormControlProps } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { ActionObject } from 'amis-core';
 import { FormBaseControlSchema, SchemaApi } from '../../Schema';
 /**
@@ -48,7 +49,7 @@ export interface Row {
 export interface ValueItem extends Column, Row {
     checked: boolean;
 }
-export interface MatrixProps extends FormControlProps {
+export interface MatrixProps extends FormControlProps, SpinnerExtraProps {
     columns: Array<Column>;
     rows: Array<Row>;
     multiple: boolean;

package/lib/renderers/Form/MatrixCheckboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -229,16 +229,14 @@ var MatrixCheckbox = /** @class */ (function (_super) {
         if (displayValue === void 0) { displayValue = '-'; }
         var _a = this.props, className = _a.className; _a.render; var cx = _a.classnames;
         var error = this.state.error;
-        return (React__default["default"].createElement("div", { key: "input", className: cx('MatrixControl', className || '') }, error
-            ? displayValue
-            : this.renderInput(true)));
+        return (React__default["default"].createElement("div", { key: "input", className: cx('MatrixControl', className || '') }, error ? displayValue : this.renderInput(true)));
     };
     MatrixCheckbox.prototype.render = function () {
-        var _a = this.props, className = _a.className; _a.style; _a.render; var cx = _a.classnames;
+        var _a = this.props, className = _a.className; _a.render; var cx = _a.classnames, loadingConfig = _a.loadingConfig;
         var _b = this.state, error = _b.error, loading = _b.loading;
         return (React__default["default"].createElement("div", { key: "input", className: cx('MatrixControl', className || '') },
             error ? (React__default["default"].createElement("div", { className: cx('MatrixControl-error Alert Alert--danger') }, String(error))) : (this.renderInput()),
-            React__default["default"].createElement(amisUi.Spinner, { size: "lg", overlay: true, key: "info", show: loading })));
+            React__default["default"].createElement(amisUi.Spinner, { size: "lg", overlay: true, key: "info", show: loading, loadingConfig: loadingConfig })));
     };
     MatrixCheckbox.defaultProps = {
         columns: [],

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import { SpinnerExtraProps } from 'amis-ui';
 import { OptionsControlProps } from 'amis-core';
 import { Option, Options } from 'amis-core';
 import { ActionObject } from 'amis-core';
@@ -38,7 +39,7 @@ export interface NestedSelectControlSchema extends FormOptionsSchema {
      */
     hideNodePathLabel?: boolean;
 }
-export interface NestedSelectProps extends OptionsControlProps {
+export interface NestedSelectProps extends OptionsControlProps, SpinnerExtraProps {
     cascade?: boolean;
     noResultsText?: string;
     withChildren?: boolean;

package/lib/renderers/Form/NestedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */
 
@@ -558,7 +558,7 @@ var NestedSelectControl = /** @class */ (function (_super) {
     };
     NestedSelectControl.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className; _b.style; var disabled = _b.disabled, cx = _b.classnames, multiple = _b.multiple, placeholder = _b.placeholder, __ = _b.translate, inline = _b.inline, searchable = _b.searchable; _b.autoComplete; var selectedOptions = _b.selectedOptions, clearable = _b.clearable, loading = _b.loading, borderMode = _b.borderMode, useMobileUI = _b.useMobileUI, env = _b.env;
+        var _b = this.props, className = _b.className; _b.style; var disabled = _b.disabled, cx = _b.classnames, multiple = _b.multiple, placeholder = _b.placeholder, __ = _b.translate, inline = _b.inline, searchable = _b.searchable; _b.autoComplete; var selectedOptions = _b.selectedOptions, clearable = _b.clearable, loading = _b.loading, borderMode = _b.borderMode, useMobileUI = _b.useMobileUI, env = _b.env, loadingConfig = _b.loadingConfig;
         var mobileUI = useMobileUI && amisCore.isMobile();
         return (React__default["default"].createElement("div", { className: cx('NestedSelectControl', className) },
             React__default["default"].createElement(amisUi.ResultBox, { useMobileUI: useMobileUI, disabled: disabled, ref: this.domRef, placeholder: __(placeholder !== null && placeholder !== void 0 ? placeholder : 'placeholder.empty'), inputPlaceholder: '', className: cx("NestedSelect", (_a = {
@@ -574,7 +574,7 @@ var NestedSelectControl = /** @class */ (function (_super) {
                     ? selectedOptions
                     : selectedOptions.length
                         ? selectedOptions[0]
-                        : '', onResultClick: this.handleOutClick, value: this.state.inputValue, onChange: this.handleInputChange, onResultChange: this.handleResultChange, onClear: this.handleResultClear, itemRender: this.renderValue, onKeyPress: this.handleKeyPress, onFocus: this.onFocus, onBlur: this.onBlur, onKeyDown: this.handleInputKeyDown, clearable: clearable, hasDropDownArrow: true, allowInput: searchable }, loading ? React__default["default"].createElement(amisUi.Spinner, { size: "sm" }) : undefined),
+                        : '', onResultClick: this.handleOutClick, value: this.state.inputValue, onChange: this.handleInputChange, onResultChange: this.handleResultChange, onClear: this.handleResultClear, itemRender: this.renderValue, onKeyPress: this.handleKeyPress, onFocus: this.onFocus, onBlur: this.onBlur, onKeyDown: this.handleInputKeyDown, clearable: clearable, hasDropDownArrow: true, allowInput: searchable }, loading ? (React__default["default"].createElement(amisUi.Spinner, { loadingConfig: loadingConfig, size: "sm" })) : undefined),
             mobileUI ? (React__default["default"].createElement(amisUi.PopUp, { className: cx("NestedSelect-popup"), container: env && env.getModalContainer ? env.getModalContainer : undefined, isShow: this.state.isOpened, onHide: this.close, showConfirm: false, showClose: false },
                 React__default["default"].createElement(amisUi.Cascader, tslib.__assign({ onClose: this.close }, this.props, { onChange: this.handleResultChange, options: this.props.options.slice(), value: selectedOptions })))) : this.state.isOpened ? (this.renderOuter()) : null));
     };

package/lib/renderers/Form/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.3-beta.3
  * Copyright 2018-2022 baidu
  */