amis 2.5.3-beta.0 → 2.5.4-alpha.4

package/lib/renderers/Form/InputImage.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.4-alpha.4
  * 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.4-alpha.4
  * 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.4-alpha.4
  * 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.4-alpha.4
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRange.js

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

package/lib/renderers/Form/InputRating.js

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

package/lib/renderers/Form/InputRepeat.js

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

package/lib/renderers/Form/InputRichText.js

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

package/lib/renderers/Form/InputSubForm.js

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

package/lib/renderers/Form/InputTable.js

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

package/lib/renderers/Form/InputTag.js

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

package/lib/renderers/Form/InputText.js

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

package/lib/renderers/Form/InputTree.js

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

package/lib/renderers/Form/InputYearRange.js

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

package/lib/renderers/Form/JSONSchema.js

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

package/lib/renderers/Form/JSONSchemaEditor.js

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

package/lib/renderers/Form/ListSelect.js

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

package/lib/renderers/Form/LocationPicker.js

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

package/lib/renderers/Form/MatrixCheckboxes.js

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

package/lib/renderers/Form/NestedSelect.js

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

package/lib/renderers/Form/Picker.js

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

package/lib/renderers/Form/Radios.js

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

package/lib/renderers/Form/Select.js

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

package/lib/renderers/Form/Static.js

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

package/lib/renderers/Form/StaticHoc.js

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

package/lib/renderers/Form/Switch.js

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

package/lib/renderers/Form/TabsTransfer.js

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

package/lib/renderers/Form/TabsTransferPicker.js

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

package/lib/renderers/Form/Textarea.js

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

package/lib/renderers/Form/Transfer.js

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

package/lib/renderers/Form/TransferPicker.js

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

package/lib/renderers/Form/TreeSelect.js

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

package/lib/renderers/Form/UUID.js

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

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

@@ -49,6 +49,7 @@ export default class UserSelectControl extends React.Component<UserSelectProps,
     onSearch(input: string, cancelExecutor: Function, param?: PlainObject): Promise<any>;
     deferLoad(data?: Object, isRef?: boolean, param?: PlainObject): Promise<any>;
     changeValue(value: Option | Array<Option> | string | void): Promise<void>;
+    renderStatic(): string | JSX.Element[];
     render(): JSX.Element;
 }
 export declare class UserSelectControlRenderer extends UserSelectControl {

package/lib/renderers/Form/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.3-beta.0
+ * amis v2.5.4-alpha.4
  * Copyright 2018-2022 baidu
  */
 
@@ -13,6 +13,7 @@ var cx = require('classnames');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var find = require('lodash/find');
+var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -156,15 +157,22 @@ var UserSelectControl = /** @class */ (function (_super) {
             });
         });
     };
+    UserSelectControl.prototype.renderStatic = function () {
+        var _a = this.props, selectedOptions = _a.selectedOptions, _b = _a.labelField, labelField = _b === void 0 ? 'label' : _b, cx = _a.classnames;
+        if (labelField === 'avatar') {
+            return selectedOptions.map(function (item, index) { return (React__default["default"].createElement("img", { key: index, className: cx('UserSelect-avatar-img'), src: item[labelField], alt: "" })); });
+        }
+        return selectedOptions.map(function (item) { return item[labelField]; }).join(',');
+    };
     UserSelectControl.prototype.render = function () {
         var _this = this;
-        var _a = this.props, showNav = _a.showNav, navTitle = _a.navTitle, searchable = _a.searchable, options = _a.options, className = _a.className; _a.style; var selectedOptions = _a.selectedOptions, tabOptions = _a.tabOptions, multi = _a.multi, multiple = _a.multiple, isDep = _a.isDep, isRef = _a.isRef, placeholder = _a.placeholder, searchPlaceholder = _a.searchPlaceholder, tabMode = _a.tabMode, data = _a.data;
+        var _a = this.props, showNav = _a.showNav, navTitle = _a.navTitle, searchable = _a.searchable, options = _a.options, className = _a.className; _a.style; var selectedOptions = _a.selectedOptions, tabOptions = _a.tabOptions, multi = _a.multi, multiple = _a.multiple, isDep = _a.isDep, isRef = _a.isRef, placeholder = _a.placeholder, searchPlaceholder = _a.searchPlaceholder, tabMode = _a.tabMode, data = _a.data, displayFields = _a.displayFields, labelField = _a.labelField;
         tabOptions === null || tabOptions === void 0 ? void 0 : tabOptions.forEach(function (item) {
             item.deferLoad = _this.deferLoad;
             item.onChange = _this.changeValue;
             item.onSearch = _this.onSearch;
         });
-        return (React__default["default"].createElement("div", { className: cx__default["default"]("UserSelectControl", className) }, tabMode ? (React__default["default"].createElement(amisUi.UserTabSelect, { selection: selectedOptions, tabOptions: tabOptions, multiple: multiple, onChange: this.changeValue, onSearch: this.onSearch, deferLoad: this.deferLoad, data: data })) : (React__default["default"].createElement(amisUi.UserSelect, { showNav: showNav, navTitle: navTitle, selection: selectedOptions, options: options, multi: multi, multiple: multiple, searchable: searchable, placeholder: placeholder, searchPlaceholder: searchPlaceholder, deferLoad: this.deferLoad, onChange: this.changeValue, onSearch: this.onSearch, isDep: isDep, isRef: isRef }))));
+        return (React__default["default"].createElement("div", { className: cx__default["default"]("UserSelectControl", className) }, tabMode ? (React__default["default"].createElement(amisUi.UserTabSelect, { selection: selectedOptions, tabOptions: tabOptions, multiple: multiple, onChange: this.changeValue, onSearch: this.onSearch, deferLoad: this.deferLoad, data: data })) : (React__default["default"].createElement(amisUi.UserSelect, { showNav: showNav, navTitle: navTitle, selection: selectedOptions, options: options, multi: multi, multiple: multiple, searchable: searchable, placeholder: placeholder, searchPlaceholder: searchPlaceholder, deferLoad: this.deferLoad, onChange: this.changeValue, onSearch: this.onSearch, displayFields: displayFields, labelField: labelField, isDep: isDep, isRef: isRef }))));
     };
     UserSelectControl.defaultProps = {
         showNav: true
@@ -187,6 +195,12 @@ var UserSelectControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], UserSelectControl.prototype, "changeValue", null);
+    tslib.__decorate([
+        StaticHoc.supportStatic(),
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], UserSelectControl.prototype, "render", null);
     return UserSelectControl;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/Grid.js

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

package/lib/renderers/Grid2D.js

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

package/lib/renderers/GridNav.js

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

package/lib/renderers/HBox.js

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

package/lib/renderers/IFrame.js

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

package/lib/renderers/Icon.js

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

package/lib/renderers/Image.d.ts

@@ -135,7 +135,9 @@ declare const ThemedImageThumb: {
         locale?: string | undefined;
         translate?: ((str: string, ...args: any[]) => string) | undefined;
     }, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps): {
-        ref: any;
+        ref: any; /**
+         * 是否新窗口打开
+         */
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;

package/lib/renderers/Image.js

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

package/lib/renderers/Images.js

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

package/lib/renderers/Json.js

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

package/lib/renderers/Link.js

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

package/lib/renderers/List.js

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

package/lib/renderers/Log.js

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

package/lib/renderers/Mapping.js

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

package/lib/renderers/Markdown.js

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

package/lib/renderers/MultilineText.js

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