amis 2.5.2-beta.0 → 2.5.3-beta.0

package/lib/renderers/Form/TreeSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -295,7 +295,7 @@ var TreeSelectControl = /** @class */ (function (_super) {
     };
     TreeSelectControl.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, disabled = _a.disabled, inline = _a.inline, loading = _a.loading, multiple = _a.multiple; _a.value; var clearable = _a.clearable, ns = _a.classPrefix, cx = _a.classnames, searchable = _a.searchable, autoComplete = _a.autoComplete, selectedOptions = _a.selectedOptions, placeholder = _a.placeholder, popOverContainer = _a.popOverContainer, useMobileUI = _a.useMobileUI, maxTagCount = _a.maxTagCount, overflowTagPopover = _a.overflowTagPopover, __ = _a.translate, env = _a.env;
+        var _a = this.props, className = _a.className; _a.style; var disabled = _a.disabled, inline = _a.inline, loading = _a.loading, multiple = _a.multiple; _a.value; var clearable = _a.clearable, ns = _a.classPrefix, cx = _a.classnames, searchable = _a.searchable, autoComplete = _a.autoComplete, selectedOptions = _a.selectedOptions, placeholder = _a.placeholder, popOverContainer = _a.popOverContainer, useMobileUI = _a.useMobileUI, maxTagCount = _a.maxTagCount, overflowTagPopover = _a.overflowTagPopover, __ = _a.translate, env = _a.env;
         var isOpened = this.state.isOpened;
         var mobileUI = useMobileUI && amisCore.isMobile();
         return (React__default["default"].createElement("div", { ref: this.container, className: cx("TreeSelectControl", className) },

package/lib/renderers/Form/UUID.js

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

package/lib/renderers/Form/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -158,7 +158,7 @@ var UserSelectControl = /** @class */ (function (_super) {
     };
     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, 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;
         tabOptions === null || tabOptions === void 0 ? void 0 : tabOptions.forEach(function (item) {
             item.deferLoad = _this.deferLoad;
             item.onChange = _this.changeValue;

package/lib/renderers/Grid.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -71,12 +71,12 @@ var Grid = /** @class */ (function (_super) {
     };
     Grid.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, cx = _b.classnames, gap = _b.gap, vAlign = _b.valign, hAlign = _b.align, _c = _b.loading, loading = _c === void 0 ? false : _c;
+        var _b = this.props, className = _b.className, style = _b.style, cx = _b.classnames, gap = _b.gap, vAlign = _b.valign, hAlign = _b.align, _c = _b.loading, loading = _c === void 0 ? false : _c;
         return (React__default["default"].createElement("div", { className: cx('Grid', (_a = {},
                 _a["Grid--".concat(gap)] = gap,
                 _a["Grid--v".concat(amisCore.ucFirst(vAlign))] = vAlign,
                 _a["Grid--h".concat(amisCore.ucFirst(hAlign))] = hAlign,
-                _a), className) },
+                _a), className), style: style },
             this.renderColumns(this.props.columns),
             React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
     };

package/lib/renderers/Grid2D.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -60,7 +60,7 @@ var Grid2D = /** @class */ (function (_super) {
         return grids.map(function (grid, key) { return _this.renderGrid(grid, key, grids.length); });
     };
     Grid2D.prototype.render = function () {
-        var _a = this.props, grids = _a.grids, cols = _a.cols, gap = _a.gap, gapRow = _a.gapRow, width = _a.width, rowHeight = _a.rowHeight;
+        var _a = this.props, grids = _a.grids, cols = _a.cols, gap = _a.gap, gapRow = _a.gapRow, width = _a.width, rowHeight = _a.rowHeight, style = _a.style;
         var templateColumns = new Array(cols);
         templateColumns.fill('1fr');
         var maxRow = 0;
@@ -86,15 +86,8 @@ var Grid2D = /** @class */ (function (_super) {
                     : grid.height;
             }
         });
-        var style = {
-            display: 'grid',
-            columnGap: gap,
-            rowGap: typeof gapRow === 'undefined' ? gap : gapRow,
-            width: width,
-            gridTemplateColumns: templateColumns.join(' '),
-            gridTemplateRows: templateRows.join(' ')
-        };
-        return React__default["default"].createElement("div", { style: style }, this.renderGrids());
+        var curStyle = tslib.__assign(tslib.__assign({}, style), { display: 'grid', columnGap: gap, rowGap: typeof gapRow === 'undefined' ? gap : gapRow, width: width, gridTemplateColumns: templateColumns.join(' '), gridTemplateRows: templateRows.join(' ') });
+        return React__default["default"].createElement("div", { style: curStyle }, this.renderGrids());
     };
     Grid2D.propsList = ['grids'];
     Grid2D.defaultProps = {

package/lib/renderers/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -45,7 +45,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
     };
     List.prototype.render = function () {
         var _this = this;
-        var _a = this.props, itemClassName = _a.itemClassName, source = _a.source, data = _a.data, options = _a.options, classnames = _a.classnames;
+        var _a = this.props, itemClassName = _a.itemClassName; _a.style; var source = _a.source, data = _a.data, options = _a.options, classnames = _a.classnames;
         var value = amisCore.getPropValue(this.props);
         var list = [];
         if (typeof source === 'string' && amisCore.isPureVariable(source)) {

package/lib/renderers/HBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -54,12 +54,12 @@ var HBox = /** @class */ (function (_super) {
     };
     HBox.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, cx = _b.classnames, gap = _b.gap, vAlign = _b.valign, hAlign = _b.align;
+        var _b = this.props, className = _b.className, style = _b.style, cx = _b.classnames, gap = _b.gap, vAlign = _b.valign, hAlign = _b.align;
         return (React__default["default"].createElement("div", { className: cx("Hbox", className, (_a = {},
                 _a["Hbox--".concat(gap)] = gap,
                 _a["Hbox--v".concat(amisCore.ucFirst(vAlign))] = vAlign,
                 _a["Hbox--h".concat(amisCore.ucFirst(hAlign))] = hAlign,
-                _a)) }, this.renderColumns()));
+                _a)), style: style }, this.renderColumns()));
     };
     HBox.propsList = ['columns'];
     HBox.defaultProps = {

package/lib/renderers/IFrame.js

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

package/lib/renderers/Icon.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -23,21 +23,21 @@ var Icon = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     Icon.prototype.render = function () {
-        var _a = this.props, vendor = _a.vendor, cx = _a.classnames, className = _a.className, data = _a.data;
+        var _a = this.props, vendor = _a.vendor, cx = _a.classnames, className = _a.className, style = _a.style, data = _a.data;
         var icon = this.props.icon;
         icon = amisCore.filter(icon, data);
         if (typeof icon !== 'string') {
             if (lodash.isObject(icon) &&
                 typeof icon.id === 'string' &&
                 icon.id.startsWith('svg-')) {
-                return (React__default["default"].createElement("svg", { className: cx('icon', className) },
+                return (React__default["default"].createElement("svg", { className: cx('icon', className), style: style },
                     React__default["default"].createElement("use", { xlinkHref: "#".concat(icon.id.replace(/^svg-/, '')) })));
             }
             return;
         }
         var CustomIcon = amisUi.getIcon(icon);
         if (CustomIcon) {
-            return React__default["default"].createElement(CustomIcon, { className: cx(className, "icon-".concat(icon)) });
+            return React__default["default"].createElement(CustomIcon, { className: cx(className, "icon-".concat(icon)), style: style });
         }
         var isURLIcon = (icon === null || icon === void 0 ? void 0 : icon.indexOf('.')) !== -1;
         var iconPrefix = '';
@@ -52,7 +52,7 @@ var Icon = /** @class */ (function (_super) {
             // 如果vendor为空，则不设置前缀,这样可以支持fontawesome v5、fontawesome v6或者其他框架
             iconPrefix = "".concat(icon);
         }
-        return isURLIcon ? (React__default["default"].createElement("img", { className: cx('Icon'), src: icon })) : (React__default["default"].createElement("i", { className: cx(iconPrefix, className) }));
+        return isURLIcon ? (React__default["default"].createElement("img", { className: cx('Icon'), src: icon, style: style })) : (React__default["default"].createElement("i", { className: cx(iconPrefix, className), style: style }));
     };
     Icon.defaultProps = {
         icon: '',

package/lib/renderers/Image.d.ts

@@ -136,9 +136,6 @@ declare const ThemedImageThumb: {
         translate?: ((str: string, ...args: any[]) => string) | undefined;
     }, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
-        /**
-         * 预览图比率
-         */
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;

package/lib/renderers/Image.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -49,7 +49,7 @@ var ImageThumb = /** @class */ (function (_super) {
         onEnlarge && onEnlarge(rest);
     };
     ImageThumb.prototype.render = function () {
-        var _a = this.props, cx = _a.classnames, className = _a.className, imageClassName = _a.imageClassName, thumbClassName = _a.thumbClassName, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, height = _a.height, width = _a.width, src = _a.src, alt = _a.alt, title = _a.title, caption = _a.caption, href = _a.href, _b = _a.blank, blank = _b === void 0 ? true : _b, htmlTarget = _a.htmlTarget; _a.onLoad; var enlargeAble = _a.enlargeAble, __ = _a.translate, overlays = _a.overlays, imageMode = _a.imageMode;
+        var _a = this.props, cx = _a.classnames, className = _a.className, style = _a.style, imageClassName = _a.imageClassName, thumbClassName = _a.thumbClassName, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, height = _a.height, width = _a.width, src = _a.src, alt = _a.alt, title = _a.title, caption = _a.caption, href = _a.href, _b = _a.blank, blank = _b === void 0 ? true : _b, htmlTarget = _a.htmlTarget; _a.onLoad; var enlargeAble = _a.enlargeAble, __ = _a.translate, overlays = _a.overlays, imageMode = _a.imageMode;
         var imageLoading = this.state.imageLoading;
         var imageContent = (React__default["default"].createElement(React__default["default"].Fragment, null,
             imageLoading ? (React__default["default"].createElement("img", { className: cx('Image-image', imageClassName), src: imagePlaceholder, alt: alt })) : null,
@@ -60,7 +60,7 @@ var ImageThumb = /** @class */ (function (_super) {
             enlargeAble ? (React__default["default"].createElement("a", { "data-tooltip": __('Image.zoomIn'), "data-position": "bottom", target: "_blank", onClick: this.handleEnlarge },
                 React__default["default"].createElement(amisUi.Icon, { icon: "view", className: "icon" }))) : null,
             overlays)) : null;
-        var image = (React__default["default"].createElement("div", { className: cx('Image', imageMode === 'original' ? 'Image--original' : 'Image--thumb', className) },
+        var image = (React__default["default"].createElement("div", { className: cx('Image', imageMode === 'original' ? 'Image--original' : 'Image--thumb', className), style: href ? undefined : style },
             imageMode === 'original' ? (React__default["default"].createElement("div", { className: cx('Image-origin', thumbMode ? "Image-origin--".concat(thumbMode) : ''), style: { height: height, width: width } },
                 imageContent,
                 enlarge)) : (React__default["default"].createElement("div", { className: cx('Image-thumbWrap') },
@@ -72,7 +72,7 @@ var ImageThumb = /** @class */ (function (_super) {
                 title ? (React__default["default"].createElement("div", { className: cx('Image-title'), title: title }, title)) : null,
                 caption ? (React__default["default"].createElement("div", { className: cx('Image-caption'), title: caption }, caption)) : null)) : null));
         if (href) {
-            image = (React__default["default"].createElement("a", { href: href, target: htmlTarget || (blank ? '_blank' : '_self'), className: cx('Link', className), title: title }, image));
+            image = (React__default["default"].createElement("a", { href: href, target: htmlTarget || (blank ? '_blank' : '_self'), className: cx('Link', className), style: style, title: title }, image));
         }
         return image;
     };
@@ -126,13 +126,13 @@ var ImageField = /** @class */ (function (_super) {
     };
     ImageField.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, innerClassName = _b.innerClassName, defaultImage = _b.defaultImage, imageCaption = _b.imageCaption, title = _b.title, data = _b.data, imageClassName = _b.imageClassName, thumbClassName = _b.thumbClassName, height = _b.height, width = _b.width, cx = _b.classnames, src = _b.src, href = _b.href, thumbMode = _b.thumbMode, thumbRatio = _b.thumbRatio, placeholder = _b.placeholder, originalSrc = _b.originalSrc, enlargeAble = _b.enlargeAble, imageMode = _b.imageMode;
+        var _b = this.props, className = _b.className, style = _b.style, innerClassName = _b.innerClassName, defaultImage = _b.defaultImage, imageCaption = _b.imageCaption, title = _b.title, data = _b.data, imageClassName = _b.imageClassName, thumbClassName = _b.thumbClassName, height = _b.height, width = _b.width, cx = _b.classnames, src = _b.src, href = _b.href, thumbMode = _b.thumbMode, thumbRatio = _b.thumbRatio, placeholder = _b.placeholder, originalSrc = _b.originalSrc, enlargeAble = _b.enlargeAble, imageMode = _b.imageMode;
         var finnalSrc = src ? amisCore.filter(src, data, '| raw') : '';
         var value = finnalSrc || amisCore.getPropValue(this.props) || defaultImage || imagePlaceholder;
         var finnalHref = href ? amisCore.filter(href, data, '| raw') : '';
         return (React__default["default"].createElement("div", { className: cx('ImageField', imageMode === 'original'
                 ? 'ImageField--original'
-                : 'ImageField--thumb', className), onClick: this.handleClick }, value ? (React__default["default"].createElement(ThemedImageThumb, { className: innerClassName, imageClassName: imageClassName, thumbClassName: thumbClassName, height: height, width: width, src: value, href: finnalHref, title: amisCore.filter(title, data), caption: amisCore.filter(imageCaption, data), thumbMode: thumbMode, thumbRatio: thumbRatio, originalSrc: (_a = amisCore.filter(originalSrc, data, '| raw')) !== null && _a !== void 0 ? _a : value, enlargeAble: enlargeAble && value !== defaultImage, onEnlarge: this.handleEnlarge, imageMode: imageMode })) : (React__default["default"].createElement("span", { className: "text-muted" }, placeholder))));
+                : 'ImageField--thumb', className), style: style, onClick: this.handleClick }, value ? (React__default["default"].createElement(ThemedImageThumb, { className: innerClassName, imageClassName: imageClassName, thumbClassName: thumbClassName, height: height, width: width, src: value, href: finnalHref, title: amisCore.filter(title, data), caption: amisCore.filter(imageCaption, data), thumbMode: thumbMode, thumbRatio: thumbRatio, originalSrc: (_a = amisCore.filter(originalSrc, data, '| raw')) !== null && _a !== void 0 ? _a : value, enlargeAble: enlargeAble && value !== defaultImage, onEnlarge: this.handleEnlarge, imageMode: imageMode })) : (React__default["default"].createElement("span", { className: "text-muted" }, placeholder))));
     };
     ImageField.defaultProps = {
         defaultImage: imagePlaceholder,

package/lib/renderers/Images.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -39,7 +39,7 @@ var ImagesField = /** @class */ (function (_super) {
     };
     ImagesField.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, defaultImage = _a.defaultImage, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, data = _a.data; _a.name; var placeholder = _a.placeholder, cx = _a.classnames, source = _a.source, delimiter = _a.delimiter, enlargeAble = _a.enlargeAble, src = _a.src, originalSrc = _a.originalSrc, listClassName = _a.listClassName, options = _a.options, showToolbar = _a.showToolbar, toolbarActions = _a.toolbarActions;
+        var _a = this.props, className = _a.className, style = _a.style, defaultImage = _a.defaultImage, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, data = _a.data; _a.name; var placeholder = _a.placeholder, cx = _a.classnames, source = _a.source, delimiter = _a.delimiter, enlargeAble = _a.enlargeAble, src = _a.src, originalSrc = _a.originalSrc, listClassName = _a.listClassName, options = _a.options, showToolbar = _a.showToolbar, toolbarActions = _a.toolbarActions;
         var value;
         var list;
         if (typeof source === 'string' && amisCore.isPureVariable(source)) {
@@ -59,7 +59,7 @@ var ImagesField = /** @class */ (function (_super) {
             list = [list];
         }
         this.list = list;
-        return (React__default["default"].createElement("div", { className: cx('ImagesField', className) }, Array.isArray(list) ? (React__default["default"].createElement("div", { className: cx('Images', listClassName) }, list.map(function (item, index) { return (React__default["default"].createElement(Image["default"], { index: index, className: cx('Images-item'), key: index, src: (src ? amisCore.filter(src, item, '| raw') : item && item.image) ||
+        return (React__default["default"].createElement("div", { className: cx('ImagesField', className), style: style }, Array.isArray(list) ? (React__default["default"].createElement("div", { className: cx('Images', listClassName) }, list.map(function (item, index) { return (React__default["default"].createElement(Image["default"], { index: index, className: cx('Images-item'), key: index, src: (src ? amisCore.filter(src, item, '| raw') : item && item.image) ||
                 item, originalSrc: (originalSrc
                 ? amisCore.filter(originalSrc, item, '| raw')
                 : item && item.src) || item, title: item && item.title, caption: item && (item.description || item.caption), thumbMode: thumbMode, thumbRatio: thumbRatio, enlargeAble: enlargeAble, onEnlarge: _this.handleEnlarge, showToolbar: showToolbar, toolbarActions: toolbarActions })); }))) : defaultImage ? (React__default["default"].createElement("div", { className: cx('Images', listClassName) },

package/lib/renderers/Json.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -41,7 +41,7 @@ var JSONField = /** @class */ (function (_super) {
     JSONField.prototype.render = function () {
         var _a;
         var _b;
-        var _c = this.props, className = _c.className, jsonTheme = _c.jsonTheme, cx = _c.classnames, placeholder = _c.placeholder, source = _c.source; _c.levelExpand; var mutable = _c.mutable, displayDataTypes = _c.displayDataTypes, enableClipboard = _c.enableClipboard, iconStyle = _c.iconStyle, quotesOnKeys = _c.quotesOnKeys, sortKeys = _c.sortKeys, name = _c.name, ellipsisThreshold = _c.ellipsisThreshold;
+        var _c = this.props, className = _c.className, style = _c.style, jsonTheme = _c.jsonTheme, cx = _c.classnames, placeholder = _c.placeholder, source = _c.source; _c.levelExpand; var mutable = _c.mutable, displayDataTypes = _c.displayDataTypes, enableClipboard = _c.enableClipboard, iconStyle = _c.iconStyle, quotesOnKeys = _c.quotesOnKeys, sortKeys = _c.sortKeys, name = _c.name, ellipsisThreshold = _c.ellipsisThreshold;
         var value = amisCore.getPropValue(this.props);
         var data = value;
         if (source !== undefined && amisCore.isPureVariable(source)) {
@@ -64,7 +64,7 @@ var JSONField = /** @class */ (function (_super) {
                 _a[typeof data] = data,
                 _a);
         }
-        return (React__default["default"].createElement("div", { className: cx('JsonField', className) }, typeof data === 'undefined' || data === null ? (placeholder) : (React__default["default"].createElement(JsonView__default["default"], { name: false, src: data, theme: (_b = jsonThemeValue) !== null && _b !== void 0 ? _b : 'rjv-default', shouldCollapse: this.shouldExpandNode, enableClipboard: enableClipboard, displayDataTypes: displayDataTypes, collapseStringsAfterLength: ellipsisThreshold, iconStyle: iconStyle, quotesOnKeys: quotesOnKeys, sortKeys: sortKeys, onEdit: name && mutable ? this.emitChange : false, onDelete: name && mutable ? this.emitChange : false, onAdd: name && mutable ? this.emitChange : false }))));
+        return (React__default["default"].createElement("div", { className: cx('JsonField', className), style: style }, typeof data === 'undefined' || data === null ? (placeholder) : (React__default["default"].createElement(JsonView__default["default"], { name: false, src: data, theme: (_b = jsonThemeValue) !== null && _b !== void 0 ? _b : 'rjv-default', shouldCollapse: this.shouldExpandNode, enableClipboard: enableClipboard, displayDataTypes: displayDataTypes, collapseStringsAfterLength: ellipsisThreshold, iconStyle: iconStyle, quotesOnKeys: quotesOnKeys, sortKeys: sortKeys, onEdit: name && mutable ? this.emitChange : false, onDelete: name && mutable ? this.emitChange : false, onAdd: name && mutable ? this.emitChange : false }))));
     };
     JSONField.defaultProps = {
         placeholder: '-',

package/lib/renderers/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -31,11 +31,11 @@ var LinkCmpt = /** @class */ (function (_super) {
     };
     LinkCmpt.prototype.getHref = function () { };
     LinkCmpt.prototype.render = function () {
-        var _a = this.props, className = _a.className, body = _a.body, href = _a.href; _a.classnames; var blank = _a.blank, disabled = _a.disabled, htmlTarget = _a.htmlTarget, data = _a.data, render = _a.render, __ = _a.translate, title = _a.title, icon = _a.icon, rightIcon = _a.rightIcon;
+        var _a = this.props, className = _a.className, style = _a.style, body = _a.body, href = _a.href; _a.classnames; var blank = _a.blank, disabled = _a.disabled, htmlTarget = _a.htmlTarget, data = _a.data, render = _a.render, __ = _a.translate, title = _a.title, icon = _a.icon, rightIcon = _a.rightIcon;
         var value = (typeof href === 'string' && href
             ? amisCore.filter(href, data, '| raw')
             : undefined) || amisCore.getPropValue(this.props);
-        return (React__default["default"].createElement(amisUi.Link, { className: className, href: value, disabled: disabled, title: title, htmlTarget: htmlTarget || (blank ? '_blank' : '_self'), icon: icon, rightIcon: rightIcon, onClick: this.handleClick }, body ? render('body', body) : value || __('link')));
+        return (React__default["default"].createElement(amisUi.Link, { className: className, style: style, href: value, disabled: disabled, title: title, htmlTarget: htmlTarget || (blank ? '_blank' : '_self'), icon: icon, rightIcon: rightIcon, onClick: this.handleClick }, body ? render('body', body) : value || __('link')));
     };
     LinkCmpt.defaultProps = {
         blank: true,

package/lib/renderers/List.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -432,14 +432,14 @@ var List = /** @class */ (function (_super) {
     List.prototype.render = function () {
         var _a;
         var _this = this;
-        var _b = this.props, className = _b.className, itemClassName = _b.itemClassName, store = _b.store, placeholder = _b.placeholder, render = _b.render; _b.multiple; var listItem = _b.listItem; _b.onAction; _b.hideCheckToggler; _b.checkOnItemClick; _b.itemAction; var affixHeader = _b.affixHeader, cx = _b.classnames, size = _b.size, __ = _b.translate, _c = _b.loading, loading = _c === void 0 ? false : _c;
+        var _b = this.props, className = _b.className, style = _b.style, itemClassName = _b.itemClassName, store = _b.store, placeholder = _b.placeholder, render = _b.render; _b.multiple; var listItem = _b.listItem; _b.onAction; _b.hideCheckToggler; _b.checkOnItemClick; _b.itemAction; var affixHeader = _b.affixHeader, cx = _b.classnames, size = _b.size, __ = _b.translate, _c = _b.loading, loading = _c === void 0 ? false : _c;
         this.renderedToolbars = [];
         var heading = this.renderHeading();
         var header = this.renderHeader();
         return (React__default["default"].createElement("div", { className: cx('List', className, (_a = {},
                 _a["List--".concat(size)] = size,
                 _a['List--unsaved'] = !!store.modified || !!store.moved,
-                _a)), ref: this.bodyRef },
+                _a)), style: style, ref: this.bodyRef },
             affixHeader && heading && header ? (React__default["default"].createElement("div", { className: cx('List-fixedTop') },
                 header,
                 heading)) : null,

package/lib/renderers/Log.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -209,7 +209,7 @@ var Log = /** @class */ (function (_super) {
     };
     Log.prototype.render = function () {
         var _this = this;
-        var _a = this.props, source = _a.source, className = _a.className, cx = _a.classnames, placeholder = _a.placeholder, height = _a.height, rowHeight = _a.rowHeight; _a.disableColor; var __ = _a.translate, operation = _a.operation;
+        var _a = this.props, source = _a.source, className = _a.className, style = _a.style, cx = _a.classnames, placeholder = _a.placeholder, height = _a.height, rowHeight = _a.rowHeight; _a.disableColor; var __ = _a.translate, operation = _a.operation;
         var _b = this.state, refresh = _b.refresh, showLineNumber = _b.showLineNumber;
         var loading = __(placeholder);
         if (!source) {
@@ -236,7 +236,7 @@ var Log = /** @class */ (function (_super) {
                 return _this.renderLine(index, line, showLineNumber);
             });
         }
-        return (React__default["default"].createElement("div", { className: cx('Log', className) },
+        return (React__default["default"].createElement("div", { className: cx('Log', className), style: style },
             React__default["default"].createElement("div", { className: cx('Log-operation') }, operation && (operation === null || operation === void 0 ? void 0 : operation.length) > 0 && (React__default["default"].createElement(React__default["default"].Fragment, null,
                 operation.includes('stop') && (React__default["default"].createElement("a", { title: __('stop'), className: !refresh ? 'is-disabled' : '', onClick: this.refresh },
                     React__default["default"].createElement(amisUi.Icon, { icon: "pause" }))),

package/lib/renderers/Mapping.d.ts

@@ -2,7 +2,7 @@
 import React from 'react';
 import { RendererEnv, RendererProps } from 'amis-core';
 import { Api } from 'amis-core';
-import { BaseSchema, SchemaApi, SchemaTokenizeableString, SchemaTpl } from '../Schema';
+import { BaseSchema, SchemaApi, SchemaTokenizeableString, SchemaTpl, SchemaCollection } from '../Schema';
 import { Instance } from 'mobx-state-tree';
 /**
  * Mapping 映射展示控件。
@@ -23,6 +23,18 @@ export interface MappingSchema extends BaseSchema {
     map?: {
         [propName: string]: SchemaTpl;
     };
+    /**
+     * map或source为对象数组时，作为value值的字段名
+     */
+    valueField?: string;
+    /**
+     * map或source为对象数组时，作为label值的字段名
+     */
+    labelField?: string;
+    /**
+     * 自定义渲染映射值，支持html或schema
+     */
+    itemSchema?: SchemaCollection;
     /**
      * 如果想远程拉取字典，请配置 source 为接口。
      */
@@ -42,6 +54,7 @@ export declare const Store: import("mobx-state-tree").IModelType<{
 } & {
     fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     errorMsg: import("mobx-state-tree").IType<string | undefined, string, string>;
+    valueField: import("mobx-state-tree").IType<string | undefined, string, string>;
     map: import("mobx-state-tree").IType<{
         [propName: string]: any;
     } | null | undefined, {
@@ -80,6 +93,7 @@ export declare const MappingField: {
             childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
             fetching: boolean;
             errorMsg: string;
+            valueField: string;
             map: {
                 [propName: string]: any;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IType<{
@@ -113,6 +127,7 @@ export declare const MappingField: {
         } & {
             fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
             errorMsg: import("mobx-state-tree").IType<string | undefined, string, string>;
+            valueField: import("mobx-state-tree").IType<string | undefined, string, string>;
             map: import("mobx-state-tree").IType<{
                 [propName: string]: any;
             } | null | undefined, {
@@ -172,6 +187,7 @@ export declare const MappingField: {
             childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
             fetching: boolean;
             errorMsg: string;
+            valueField: string;
             map: {
                 [propName: string]: any;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IType<{
@@ -205,6 +221,7 @@ export declare const MappingField: {
         } & {
             fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
             errorMsg: import("mobx-state-tree").IType<string | undefined, string, string>;
+            valueField: import("mobx-state-tree").IType<string | undefined, string, string>;
             map: import("mobx-state-tree").IType<{
                 [propName: string]: any;
             } | null | undefined, {
@@ -259,7 +276,8 @@ export declare const MappingField: {
             componentDidMount(): void;
             componentDidUpdate(prevProps: MappingProps): void;
             reload(): void;
-            renderSingleValue(key: any, reactKey?: number): JSX.Element;
+            renderSingleValue(key: any, reactKey?: number, needStyle?: boolean): JSX.Element;
+            renderViewValue(value: any): any;
             render(): JSX.Element;
             context: any;
             setState<K extends never>(state: object | ((prevState: object, props: Readonly<MappingProps>) => object | Pick<object, K> | null) | Pick<object, K> | null, callback?: (() => void) | undefined): void;
@@ -291,7 +309,8 @@ export declare const MappingField: {
         componentDidMount(): void;
         componentDidUpdate(prevProps: MappingProps): void;
         reload(): void;
-        renderSingleValue(key: any, reactKey?: number): JSX.Element;
+        renderSingleValue(key: any, reactKey?: number, needStyle?: boolean): JSX.Element;
+        renderViewValue(value: any): any;
         render(): JSX.Element;
         context: any;
         setState<K extends never>(state: object | ((prevState: object, props: Readonly<MappingProps>) => object | Pick<object, K> | null) | Pick<object, K> | null, callback?: (() => void) | undefined): void;
@@ -322,7 +341,8 @@ export declare const MappingField: {
             componentDidMount(): void;
             componentDidUpdate(prevProps: MappingProps): void;
             reload(): void;
-            renderSingleValue(key: any, reactKey?: number): JSX.Element;
+            renderSingleValue(key: any, reactKey?: number, needStyle?: boolean): JSX.Element;
+            renderViewValue(value: any): any;
             render(): JSX.Element;
             context: any;
             setState<K extends never>(state: object | ((prevState: object, props: Readonly<MappingProps>) => object | Pick<object, K> | null) | Pick<object, K> | null, callback?: (() => void) | undefined): void;

package/lib/renderers/Mapping.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -22,6 +22,7 @@ var Store = amisCore.StoreNode.named('MappingStore')
     .props({
     fetching: false,
     errorMsg: '',
+    valueField: 'value',
     map: mobxStateTree.types.frozen({})
 })
     .actions(function (self) {
@@ -57,6 +58,28 @@ var Store = amisCore.StoreNode.named('MappingStore')
     return {
         load: load,
         setMap: function (options) {
+            if (Array.isArray(options)) {
+                options = options.reduce(function (res, now) {
+                    if (now == null) {
+                        return res;
+                    }
+                    else if (amisCore.isObject(now)) {
+                        var keys = Object.keys(now);
+                        if (keys.length === 1
+                            || (keys.length == 2 && keys.includes('$$id'))) {
+                            // 针对amis-editor的特殊处理
+                            keys = keys.filter(function (key) { return key !== '$$id'; });
+                            // 单key 数组对象
+                            res[keys[0]] = now[keys[0]];
+                        }
+                        else if (keys.length > 1) {
+                            // 多key 数组对象
+                            res[now[self.valueField]] = now;
+                        }
+                    }
+                    return res;
+                }, {});
+            }
             if (amisCore.isObject(options)) {
                 self.map = tslib.__assign({}, options);
             }
@@ -72,17 +95,16 @@ var MappingField = amisUi.withStore(function (props) {
         tslib.__extends(class_1, _super);
         function class_1(props) {
             var _this = _super.call(this, props) || this;
-            props.store.syncProps(props, undefined, ['map']);
+            props.store.syncProps(props, undefined, ['valueField', 'map']);
             return _this;
         }
         class_1.prototype.componentDidMount = function () {
-            var _a = this.props; _a.store; _a.source; _a.data;
             this.reload();
         };
         class_1.prototype.componentDidUpdate = function (prevProps) {
             var props = this.props;
             var _a = this.props, store = _a.store, source = _a.source, data = _a.data;
-            store.syncProps(props, prevProps, ['map']);
+            store.syncProps(props, prevProps, ['valueField', 'map']);
             if (amisCore.isPureVariable(source)) {
                 var prev = amisCore.resolveVariableAndFilter(prevProps.source, prevProps.data, '| raw');
                 var curr = amisCore.resolveVariableAndFilter(source, data, '| raw');
@@ -107,14 +129,15 @@ var MappingField = amisUi.withStore(function (props) {
                 store.load(env, api, data);
             }
         };
-        class_1.prototype.renderSingleValue = function (key, reactKey) {
+        class_1.prototype.renderSingleValue = function (key, reactKey, needStyle) {
             var _a;
-            var _b = this.props, className = _b.className, placeholder = _b.placeholder, render = _b.render, cx = _b.classnames; _b.name; _b.data; var store = _b.store;
+            var _b = this.props, className = _b.className, style = _b.style, placeholder = _b.placeholder, cx = _b.classnames, store = _b.store;
             var viewValue = (React__default["default"].createElement("span", { className: "text-muted" }, placeholder));
             var map = store.map;
             var value = undefined;
             // trim 一下，干掉一些空白字符。
             key = typeof key === 'string' ? key.trim() : key;
+            var curStyle = needStyle ? style : undefined;
             if (typeof key !== 'undefined' &&
                 map &&
                 (value =
@@ -123,20 +146,45 @@ var MappingField = amisUi.withStore(function (props) {
                         : key === false && map['0']
                             ? map['0']
                             : map['*'])) !== undefined) {
-                viewValue = render('tpl', value);
+                viewValue = this.renderViewValue(value);
+            }
+            return (React__default["default"].createElement("span", { key: "map-".concat(reactKey), className: cx('MappingField', className), style: curStyle }, viewValue));
+        };
+        class_1.prototype.renderViewValue = function (value) {
+            var _a = this.props, render = _a.render, itemSchema = _a.itemSchema, data = _a.data, labelField = _a.labelField;
+            if (!itemSchema) {
+                var label = value;
+                if (amisCore.isObject(value)) {
+                    if (labelField === undefined || labelField === '') {
+                        if (!value.hasOwnProperty('type')) {
+                            // 映射值是object
+                            // 没配置labelField
+                            // object 也没有 type，不能作为schema渲染
+                            // 默认取 label 字段
+                            label = value['label'];
+                        }
+                    }
+                    else {
+                        label = value[labelField || 'label'];
+                    }
+                }
+                return render('tpl', label);
             }
-            return (React__default["default"].createElement("span", { key: "map-".concat(reactKey), className: cx('MappingField', className) }, viewValue));
+            return render('mappingItemSchema', itemSchema, {
+                data: amisCore.createObject(data, amisCore.isObject(value) ? value : { item: value })
+            });
         };
         class_1.prototype.render = function () {
             var _this = this;
+            var style = this.props.style;
             var mapKey = amisCore.getPropValue(this.props);
             if (Array.isArray(mapKey)) {
-                return (React__default["default"].createElement("span", null, mapKey.map(function (singleKey, index) {
+                return (React__default["default"].createElement("span", { style: style }, mapKey.map(function (singleKey, index) {
                     return _this.renderSingleValue(singleKey, index);
                 })));
             }
             else {
-                return this.renderSingleValue(mapKey, 0);
+                return this.renderSingleValue(mapKey, 0, true);
             }
         };
         return class_1;

package/lib/renderers/Markdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.2-beta.0
+ * amis v2.5.3-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -83,8 +83,8 @@ var Markdown = /** @class */ (function (_super) {
         });
     };
     Markdown.prototype.render = function () {
-        var _a = this.props, className = _a.className, cx = _a.classnames, options = _a.options;
-        return (React__default["default"].createElement("div", { className: cx('Markdown', className) },
+        var _a = this.props, className = _a.className, style = _a.style, cx = _a.classnames, options = _a.options;
+        return (React__default["default"].createElement("div", { className: cx('Markdown', className), style: style },
             React__default["default"].createElement(amisCore.LazyComponent, { getComponent: loadComponent, content: this.state.content || '', options: options })));
     };
     return Markdown;