amis 2.8.0 → 3.0.0

package/lib/renderers/Dialog.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -304,15 +304,15 @@ var Dialog = /** @class */ (function (_super) {
         return (React__default["default"].createElement(Wrapper, { classPrefix: classPrefix, className: cx(className), style: style, size: size, height: height, width: width, backdrop: "static", onHide: this.handleSelfClose, keyboard: closeOnEsc && !store.loading, closeOnEsc: closeOnEsc, closeOnOutside: !store.dialogOpen && closeOnOutside, show: show, onEntered: this.handleEntered, onExited: this.handleExited, container: env && env.getModalContainer ? env.getModalContainer : undefined, enforceFocus: false, disabled: store.loading },
             title && typeof title === 'string' ? (React__default["default"].createElement("div", { className: cx('Modal-header', headerClassName) },
                 showCloseButton !== false && !store.loading ? (React__default["default"].createElement("a", { "data-tooltip": __('Dialog.close'), "data-position": "left", onClick: this.handleSelfClose, className: cx('Modal-close') },
-                    React__default["default"].createElement(amisUi.Icon, { icon: "close", className: "icon" }))) : null,
+                    React__default["default"].createElement(amisUi.Icon, { icon: "close", className: "icon", iconContent: "Dialog-close" }))) : null,
                 React__default["default"].createElement("div", { className: cx('Modal-title') }, amisCore.filter(__(title), store.formData)))) : title ? (React__default["default"].createElement("div", { className: cx('Modal-header', headerClassName) },
                 showCloseButton !== false && !store.loading ? (React__default["default"].createElement("a", { "data-tooltip": __('Dialog.close'), onClick: this.handleSelfClose, className: cx('Modal-close') },
-                    React__default["default"].createElement(amisUi.Icon, { icon: "close", className: "icon" }))) : null,
+                    React__default["default"].createElement(amisUi.Icon, { icon: "close", className: "icon", iconContent: "Dialog-close" }))) : null,
                 render('title', title, {
                     data: store.formData,
                     onAction: this.handleAction
                 }))) : showCloseButton !== false && !store.loading ? (React__default["default"].createElement("a", { "data-tooltip": __('Dialog.close'), onClick: this.handleSelfClose, className: cx('Modal-close') },
-                React__default["default"].createElement(amisUi.Icon, { icon: "close", className: "icon" }))) : null,
+                React__default["default"].createElement(amisUi.Icon, { icon: "close", className: "icon", iconContent: "Dialog-close" }))) : null,
             header
                 ? render('header', header, {
                     data: store.formData,
@@ -439,7 +439,8 @@ var Dialog = /** @class */ (function (_super) {
                 if ((action.type === 'submit' ||
                     action.actionType === 'submit' ||
                     action.actionType === 'confirm') &&
-                    action.close !== false) {
+                    action.close !== false &&
+                    !targets.some(function (item) { return item.props.closeDialogOnSubmit === false; })) {
                     onConfirm && onConfirm(values, rawAction || action, ctx, targets);
                 }
                 else if (action.close) {
@@ -466,7 +467,7 @@ var Dialog = /** @class */ (function (_super) {
     DialogRenderer.prototype.handleAction = function (e, action, data, throwErrors, delegate) {
         if (throwErrors === void 0) { throwErrors = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onAction, store, onConfirm, env, dispatchEvent, onClose, scoped, rendererEvent, rendererEvent, handleResult, ret;
+            var _a, onAction, store, onConfirm, env, dispatchEvent, onClose, scoped, rendererEvent, rendererEvent, handleResult;
             var _this = this;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
@@ -481,7 +482,7 @@ var Dialog = /** @class */ (function (_super) {
                         if (!(action.type === 'reset')) return [3 /*break*/, 1];
                         store.setCurrentAction(action);
                         store.reset();
-                        return [3 /*break*/, 6];
+                        return [3 /*break*/, 13];
                     case 1:
                         if (!(action.actionType === 'close' ||
                             action.actionType === 'cancel')) return [3 /*break*/, 3];
@@ -495,8 +496,12 @@ var Dialog = /** @class */ (function (_super) {
                         // clear error
                         store.updateMessage();
                         onClose();
-                        action.close && this.closeTarget(action.close);
-                        return [3 /*break*/, 6];
+                        if (action.close) {
+                            action.close === true
+                                ? this.handleSelfClose()
+                                : this.closeTarget(action.close);
+                        }
+                        return [3 /*break*/, 13];
                     case 3:
                         if (!(action.actionType === 'confirm')) return [3 /*break*/, 5];
                         return [4 /*yield*/, dispatchEvent('confirm', amisCore.createObject(this.props.data, data))];
@@ -512,78 +517,91 @@ var Dialog = /** @class */ (function (_super) {
                             store.updateMessage();
                             onClose(true);
                         }
-                        return [3 /*break*/, 6];
+                        return [3 /*break*/, 13];
                     case 5:
-                        if (action.actionType === 'next' || action.actionType === 'prev') {
-                            store.setCurrentAction(action);
-                            if (action.type === 'submit') {
-                                this.tryChildrenToHandle(tslib.__assign(tslib.__assign({}, action), { actionType: 'submit', close: true }), data, action) || this.handleSelfClose(undefined, true);
-                            }
-                            else {
-                                onConfirm([data], action, data, []);
-                            }
-                        }
-                        else if (action.actionType === 'dialog') {
-                            store.setCurrentAction(action);
-                            store.openDialog(data);
+                        if (!(action.actionType === 'next' || action.actionType === 'prev')) return [3 /*break*/, 6];
+                        store.setCurrentAction(action);
+                        if (action.type === 'submit') {
+                            this.tryChildrenToHandle(tslib.__assign(tslib.__assign({}, action), { actionType: 'submit', close: true }), data, action) || this.handleSelfClose(undefined, true);
                         }
-                        else if (action.actionType === 'drawer') {
-                            store.setCurrentAction(action);
-                            store.openDrawer(data);
+                        else {
+                            onConfirm([data], action, data, []);
                         }
-                        else if (action.actionType === 'reload') {
-                            store.setCurrentAction(action);
-                            action.target && scoped.reload(action.target, data);
-                            if (action.close || action.type === 'submit') {
-                                this.handleSelfClose(undefined, action.type === 'submit');
+                        return [3 /*break*/, 13];
+                    case 6:
+                        if (!(action.actionType === 'dialog')) return [3 /*break*/, 7];
+                        store.setCurrentAction(action);
+                        store.openDialog(data);
+                        return [3 /*break*/, 13];
+                    case 7:
+                        if (!(action.actionType === 'drawer')) return [3 /*break*/, 8];
+                        store.setCurrentAction(action);
+                        store.openDrawer(data);
+                        return [3 /*break*/, 13];
+                    case 8:
+                        if (!(action.actionType === 'reload')) return [3 /*break*/, 9];
+                        store.setCurrentAction(action);
+                        action.target && scoped.reload(action.target, data);
+                        if (action.close || action.type === 'submit') {
+                            this.handleSelfClose(undefined, action.type === 'submit');
+                            action.close &&
+                                typeof action.close === 'string' &&
                                 this.closeTarget(action.close);
-                            }
                         }
-                        else if (this.tryChildrenToHandle(action, data)) ;
-                        else if (action.actionType === 'ajax') {
-                            store.setCurrentAction(action);
-                            store
-                                .saveRemote(action.api, data, {
-                                successMessage: action.messages && action.messages.success,
-                                errorMessage: action.messages && action.messages.failed
-                            })
-                                .then(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
-                                var reidrect;
-                                return tslib.__generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            if (!(action.feedback && amisCore.isVisible(action.feedback, store.data))) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, this.openFeedback(action.feedback, store.data)];
-                                        case 1:
-                                            _a.sent();
-                                            _a.label = 2;
-                                        case 2:
-                                            reidrect = action.redirect && amisCore.filter(action.redirect, store.data);
-                                            reidrect && env.jumpTo(reidrect, action);
-                                            action.reload && this.reloadTarget(action.reload, store.data);
-                                            if (action.close) {
-                                                this.handleSelfClose();
-                                                this.closeTarget(action.close);
-                                            }
-                                            return [2 /*return*/];
-                                    }
-                                });
-                            }); })
-                                .catch(function (e) {
-                                if (throwErrors || action.countDown) {
-                                    throw e;
+                        return [3 /*break*/, 13];
+                    case 9:
+                        if (!this.tryChildrenToHandle(action, data)) return [3 /*break*/, 10];
+                        return [3 /*break*/, 13];
+                    case 10:
+                        if (!(action.actionType === 'ajax')) return [3 /*break*/, 11];
+                        store.setCurrentAction(action);
+                        store
+                            .saveRemote(action.api, data, {
+                            successMessage: action.messages && action.messages.success,
+                            errorMessage: action.messages && action.messages.failed
+                        })
+                            .then(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                            var reidrect;
+                            return tslib.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (!(action.feedback && amisCore.isVisible(action.feedback, store.data))) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, this.openFeedback(action.feedback, store.data)];
+                                    case 1:
+                                        _a.sent();
+                                        _a.label = 2;
+                                    case 2:
+                                        reidrect = action.redirect && amisCore.filter(action.redirect, store.data);
+                                        reidrect && env.jumpTo(reidrect, action);
+                                        action.reload &&
+                                            this.reloadTarget(amisCore.filter(action.reload, store.data), store.data);
+                                        if (action.close) {
+                                            action.close === true
+                                                ? this.handleSelfClose()
+                                                : this.closeTarget(action.close);
+                                        }
+                                        return [2 /*return*/];
                                 }
                             });
+                        }); })
+                            .catch(function (e) {
+                            if (throwErrors || action.countDown) {
+                                throw e;
+                            }
+                        });
+                        return [3 /*break*/, 13];
+                    case 11:
+                        if (!onAction) return [3 /*break*/, 13];
+                        return [4 /*yield*/, onAction(e, tslib.__assign(tslib.__assign({}, action), { close: false }), data, throwErrors, delegate || this.context)];
+                    case 12:
+                        _b.sent();
+                        if (action.close) {
+                            action.close === true
+                                ? this.handleSelfClose()
+                                : this.closeTarget(action.close);
                         }
-                        else if (onAction) {
-                            ret = onAction(e, tslib.__assign(tslib.__assign({}, action), { close: false }), data, throwErrors, delegate || this.context);
-                            action.close &&
-                                (ret && ret.then
-                                    ? ret.then(this.handleSelfClose)
-                                    : setTimeout(this.handleSelfClose, 200));
-                        }
-                        _b.label = 6;
-                    case 6: return [2 /*return*/];
+                        _b.label = 13;
+                    case 13: return [2 /*return*/];
                 }
             });
         });

package/lib/renderers/Divider.d.ts

@@ -3,7 +3,7 @@ import { RendererProps } from 'amis-core';
 import { BaseSchema } from '../Schema';
 /**
  * Divider 分割线渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/divider
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/divider
  */
 export interface DividerSchema extends BaseSchema {
     type: 'divider';

package/lib/renderers/Divider.js

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

package/lib/renderers/Drawer.d.ts

@@ -8,7 +8,7 @@ import { BaseSchema, SchemaClassName, SchemaCollection, SchemaName } from '../Sc
 import { ActionSchema } from './Action';
 /**
  * Drawer 抽出式弹框。
- * 文档：https://baidu.gitee.io/amis/docs/components/drawer
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/drawer
  */
 export interface DrawerSchema extends BaseSchema {
     type: 'drawer';

package/lib/renderers/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -456,7 +456,7 @@ var Drawer = /** @class */ (function (_super) {
     DrawerRenderer.prototype.handleAction = function (e, action, data, throwErrors, delegate) {
         if (throwErrors === void 0) { throwErrors = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onClose, onAction, store, env, dispatchEvent, scoped, rendererEvent, rendererEvent, ret;
+            var _a, onClose, onAction, store, env, dispatchEvent, scoped, rendererEvent, rendererEvent;
             var _this = this;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
@@ -477,8 +477,12 @@ var Drawer = /** @class */ (function (_super) {
                         }
                         store.setCurrentAction(action);
                         onClose();
-                        action.close && this.closeTarget(action.close);
-                        return [3 /*break*/, 5];
+                        if (action.close) {
+                            action.close === true
+                                ? this.handleSelfClose()
+                                : this.closeTarget(action.close);
+                        }
+                        return [3 /*break*/, 11];
                     case 2:
                         if (!(action.actionType === 'confirm')) return [3 /*break*/, 4];
                         return [4 /*yield*/, dispatchEvent('confirm', amisCore.createObject(this.props.data, data))];
@@ -489,69 +493,80 @@ var Drawer = /** @class */ (function (_super) {
                         }
                         store.setCurrentAction(action);
                         this.tryChildrenToHandle(action, data) || onClose();
-                        return [3 /*break*/, 5];
+                        return [3 /*break*/, 11];
                     case 4:
-                        if (action.actionType === 'drawer') {
-                            store.setCurrentAction(action);
-                            store.openDrawer(data);
-                        }
-                        else if (action.actionType === 'dialog') {
-                            store.setCurrentAction(action);
-                            store.openDialog(data);
-                        }
-                        else if (action.actionType === 'reload') {
-                            store.setCurrentAction(action);
-                            action.target && scoped.reload(action.target, data);
-                            if (action.close) {
-                                this.handleSelfClose();
-                                this.closeTarget(action.close);
-                            }
+                        if (!(action.actionType === 'drawer')) return [3 /*break*/, 5];
+                        store.setCurrentAction(action);
+                        store.openDrawer(data);
+                        return [3 /*break*/, 11];
+                    case 5:
+                        if (!(action.actionType === 'dialog')) return [3 /*break*/, 6];
+                        store.setCurrentAction(action);
+                        store.openDialog(data);
+                        return [3 /*break*/, 11];
+                    case 6:
+                        if (!(action.actionType === 'reload')) return [3 /*break*/, 7];
+                        store.setCurrentAction(action);
+                        action.target && scoped.reload(action.target, data);
+                        if (action.close) {
+                            action.close === true
+                                ? this.handleSelfClose()
+                                : this.closeTarget(action.close);
                         }
-                        else if (this.tryChildrenToHandle(action, data)) ;
-                        else if (action.actionType === 'ajax') {
-                            store.setCurrentAction(action);
-                            store
-                                .saveRemote(action.api, data, {
-                                successMessage: action.messages && action.messages.success,
-                                errorMessage: action.messages && action.messages.failed
-                            })
-                                .then(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
-                                var redirect;
-                                return tslib.__generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            if (!(action.feedback && amisCore.isVisible(action.feedback, store.data))) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, this.openFeedback(action.feedback, store.data)];
-                                        case 1:
-                                            _a.sent();
-                                            _a.label = 2;
-                                        case 2:
-                                            redirect = action.redirect && amisCore.filter(action.redirect, store.data);
-                                            redirect && env.jumpTo(redirect, action);
-                                            action.reload && this.reloadTarget(action.reload, store.data);
-                                            if (action.close) {
-                                                this.handleSelfClose();
-                                                this.closeTarget(action.close);
-                                            }
-                                            return [2 /*return*/];
-                                    }
-                                });
-                            }); })
-                                .catch(function (e) {
-                                if (throwErrors || action.countDown) {
-                                    throw e;
+                        return [3 /*break*/, 11];
+                    case 7:
+                        if (!this.tryChildrenToHandle(action, data)) return [3 /*break*/, 8];
+                        return [3 /*break*/, 11];
+                    case 8:
+                        if (!(action.actionType === 'ajax')) return [3 /*break*/, 9];
+                        store.setCurrentAction(action);
+                        store
+                            .saveRemote(action.api, data, {
+                            successMessage: action.messages && action.messages.success,
+                            errorMessage: action.messages && action.messages.failed
+                        })
+                            .then(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                            var redirect;
+                            return tslib.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (!(action.feedback && amisCore.isVisible(action.feedback, store.data))) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, this.openFeedback(action.feedback, store.data)];
+                                    case 1:
+                                        _a.sent();
+                                        _a.label = 2;
+                                    case 2:
+                                        redirect = action.redirect && amisCore.filter(action.redirect, store.data);
+                                        redirect && env.jumpTo(redirect, action);
+                                        action.reload &&
+                                            this.reloadTarget(amisCore.filter(action.reload, store.data), store.data);
+                                        if (action.close) {
+                                            action.close === true
+                                                ? this.handleSelfClose()
+                                                : this.closeTarget(action.close);
+                                        }
+                                        return [2 /*return*/];
                                 }
                             });
+                        }); })
+                            .catch(function (e) {
+                            if (throwErrors || action.countDown) {
+                                throw e;
+                            }
+                        });
+                        return [3 /*break*/, 11];
+                    case 9:
+                        if (!onAction) return [3 /*break*/, 11];
+                        return [4 /*yield*/, onAction(e, action, data, throwErrors, delegate || this.context)];
+                    case 10:
+                        _b.sent();
+                        if (action.close) {
+                            action.close === true
+                                ? this.handleSelfClose()
+                                : this.closeTarget(action.close);
                         }
-                        else if (onAction) {
-                            ret = onAction(e, action, data, throwErrors, delegate || this.context);
-                            action.close &&
-                                (ret && ret.then
-                                    ? ret.then(this.handleSelfClose)
-                                    : setTimeout(this.handleSelfClose, 200));
-                        }
-                        _b.label = 5;
-                    case 5: return [2 /*return*/];
+                        _b.label = 11;
+                    case 11: return [2 /*return*/];
                 }
             });
         });

package/lib/renderers/DropDownButton.d.ts

@@ -9,7 +9,7 @@ export type DropdownButton = (ActionSchema & {
 }) | DividerSchema | 'divider';
 /**
  * 下拉按钮渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/dropdown-button
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/dropdown-button
  */
 export interface DropdownButtonSchema extends BaseSchema {
     /**
@@ -75,6 +75,7 @@ export interface DropdownButtonSchema extends BaseSchema {
      * 菜单 CSS 样式
      */
     menuClassName?: string;
+    overlayPlacement?: string;
 }
 export interface DropDownButtonProps extends RendererProps, Omit<DropdownButtonSchema, 'type' | 'className'> {
     disabledTip?: string | TooltipObject;
@@ -96,7 +97,7 @@ export interface DropDownButtonState {
 }
 export default class DropDownButton extends React.Component<DropDownButtonProps, DropDownButtonState> {
     state: DropDownButtonState;
-    static defaultProps: Pick<DropDownButtonProps, 'placement' | 'tooltipTrigger' | 'tooltipRootClose'>;
+    static defaultProps: Pick<DropDownButtonProps, 'placement' | 'tooltipTrigger' | 'tooltipRootClose' | 'overlayPlacement'>;
     target: any;
     timer: ReturnType<typeof setTimeout>;
     constructor(props: DropDownButtonProps);

package/lib/renderers/DropDownButton.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -111,7 +111,7 @@ var DropDownButton = /** @class */ (function (_super) {
     DropDownButton.prototype.renderOuter = function () {
         var _this = this;
         var _a;
-        var _b = this.props; _b.render; var buttons = _b.buttons; _b.data; var popOverContainer = _b.popOverContainer, cx = _b.classnames, ns = _b.classPrefix, children = _b.children; _b.align; var closeOnClick = _b.closeOnClick, closeOnOutside = _b.closeOnOutside, menuClassName = _b.menuClassName;
+        var _b = this.props; _b.render; var buttons = _b.buttons; _b.data; var popOverContainer = _b.popOverContainer, cx = _b.classnames, ns = _b.classPrefix, children = _b.children; _b.align; var closeOnClick = _b.closeOnClick, closeOnOutside = _b.closeOnOutside, menuClassName = _b.menuClassName, overlayPlacement = _b.overlayPlacement, trigger = _b.trigger;
         var body = (React__default["default"].createElement(amisCore.RootClose, { disabled: !this.state.isOpened, onRootClose: closeOnOutside !== false ? this.close : amisCore.noop }, function (ref) {
             return (React__default["default"].createElement("ul", { className: cx('DropDown-menu-root', 'DropDown-menu', menuClassName), onClick: closeOnClick ? _this.close : amisCore.noop, onMouseEnter: _this.keepOpen, ref: ref }, children
                 ? children
@@ -122,8 +122,8 @@ var DropDownButton = /** @class */ (function (_super) {
                     : null));
         }));
         if (popOverContainer) {
-            return (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer, target: function () { return _this.target; }, show: true },
-                React__default["default"].createElement(amisCore.PopOver, { overlay: true, onHide: this.close, classPrefix: ns, className: cx('DropDown-popover', menuClassName), style: { minWidth: (_a = this.target) === null || _a === void 0 ? void 0 : _a.offsetWidth } }, body)));
+            return (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer, target: function () { return _this.target; }, placement: overlayPlacement, show: true },
+                React__default["default"].createElement(amisCore.PopOver, { overlay: trigger !== 'hover', onHide: this.close, classPrefix: ns, className: cx('DropDown-popover', menuClassName), style: { minWidth: (_a = this.target) === null || _a === void 0 ? void 0 : _a.offsetWidth } }, body)));
         }
         return body;
     };
@@ -155,7 +155,8 @@ var DropDownButton = /** @class */ (function (_super) {
     DropDownButton.defaultProps = {
         placement: 'top',
         tooltipTrigger: ['hover', 'focus'],
-        tooltipRootClose: false
+        tooltipRootClose: false,
+        overlayPlacement: 'auto'
     };
     return DropDownButton;
 }(React__default["default"].Component));

package/lib/renderers/Each.d.ts

@@ -4,7 +4,7 @@ import { Schema } from 'amis-core';
 import { BaseSchema, SchemaCollection } from '../Schema';
 /**
  * Each 循环功能渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/each
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/each
  */
 export interface EachSchema extends BaseSchema {
     /**

package/lib/renderers/Each.js

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

package/lib/renderers/Flex.d.ts

@@ -6,7 +6,7 @@ import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaCollection } from '../Schema';
 /**
  * Flex 布局
- * 文档：https://baidu.gitee.io/amis/docs/components/flex
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/flex
  */
 export interface FlexSchema extends BaseSchema {
     /**

package/lib/renderers/Flex.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -24,8 +24,9 @@ var Flex = /** @class */ (function (_super) {
         return _super.call(this, props) || this;
     }
     Flex.prototype.render = function () {
-        var _a = this.props, items = _a.items, direction = _a.direction, justify = _a.justify, alignItems = _a.alignItems, alignContent = _a.alignContent, style = _a.style, className = _a.className, render = _a.render, disabled = _a.disabled;
-        var flexStyle = tslib.__assign({ display: 'flex', flexDirection: direction, justifyContent: justify, alignItems: alignItems, alignContent: alignContent }, style);
+        var _a = this.props, items = _a.items, direction = _a.direction, justify = _a.justify, alignItems = _a.alignItems, alignContent = _a.alignContent, style = _a.style, className = _a.className, render = _a.render, disabled = _a.disabled, data = _a.data;
+        var styleVar = amisCore.buildStyle(style, data);
+        var flexStyle = tslib.__assign({ display: 'flex', flexDirection: direction, justifyContent: justify, alignItems: alignItems, alignContent: alignContent }, styleVar);
         return (React__default["default"].createElement("div", { style: flexStyle, className: className }, (Array.isArray(items) ? items : items ? [items] : []).map(function (item, key) {
             var _a;
             return render("flexItem/".concat(key), item, {

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

@@ -2,10 +2,11 @@ import React from 'react';
 import { OptionsControlProps, FormOptionsControl } from 'amis-core';
 import type { Option } from 'amis-core';
 import { ActionObject } from 'amis-core';
+import type { BadgeObject } from 'amis-ui';
 import { ButtonGroupSchema } from '../ButtonGroup';
 /**
  * 按钮组控件。
- * 文档：https://baidu.gitee.io/amis/docs/components/form/button-group
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/button-group
  */
 export interface ButtonGroupControlSchema extends Omit<ButtonGroupSchema, 'type'>, Omit<FormOptionsControl, 'size'> {
     type: 'button-group-select';
@@ -18,9 +19,8 @@ export default class ButtonGroupControl extends React.Component<ButtonGroupProps
     doAction(action: ActionObject, data: object, throwErrors: boolean): void;
     handleToggle(option: Option): void;
     reload(): void;
-    render(props?: Readonly<ButtonGroupProps> & Readonly<{
-        children?: React.ReactNode;
-    }>): JSX.Element;
+    getBadgeConfig(config: BadgeObject, item: Option): any;
+    render(props?: Readonly<ButtonGroupProps>): JSX.Element;
 }
 export declare class ButtonGroupControlRenderer extends ButtonGroupControl {
 }

package/lib/renderers/Form/ButtonGroupSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -39,11 +39,18 @@ var ButtonGroupControl = /** @class */ (function (_super) {
         var reload = this.props.reloadOptions;
         reload && reload();
     };
+    ButtonGroupControl.prototype.getBadgeConfig = function (config, item) {
+        return config
+            ? (item === null || item === void 0 ? void 0 : item.badge) && (typeof item.badge === 'string' || typeof item.badge === 'number')
+                ? tslib.__assign(tslib.__assign({}, config), { text: item.badge }) : (item === null || item === void 0 ? void 0 : item.badge) && amisCore.isObject(item.badge)
+                ? tslib.__assign(tslib.__assign({}, config), item.badge) : null
+            : item.badge;
+    };
     ButtonGroupControl.prototype.render = function (props) {
         var _a;
         var _this = this;
         if (props === void 0) { props = this.props; }
-        var render = props.render, ns = props.classPrefix, cx = props.classnames, className = props.className; props.style; var disabled = props.disabled, options = props.options; props.value; var labelField = props.labelField, placeholder = props.placeholder, btnClassName = props.btnClassName, btnActiveClassName = props.btnActiveClassName, selectedOptions = props.selectedOptions, buttons = props.buttons, size = props.size, block = props.block, vertical = props.vertical, tiled = props.tiled, __ = props.translate;
+        var render = props.render, ns = props.classPrefix, cx = props.classnames, className = props.className; props.style; var disabled = props.disabled, options = props.options; props.value; var labelField = props.labelField, placeholder = props.placeholder, btnClassName = props.btnClassName, btnActiveClassName = props.btnActiveClassName, selectedOptions = props.selectedOptions, buttons = props.buttons, size = props.size, block = props.block, vertical = props.vertical, tiled = props.tiled, badge = props.badge, __ = props.translate;
         var body = [];
         var btnLevel = props.btnLevel;
         var btnActiveLevel = props.btnActiveLevel;
@@ -53,10 +60,12 @@ var ButtonGroupControl = /** @class */ (function (_super) {
         if (options && options.length) {
             body = options.map(function (option, key) {
                 var active = !!~selectedOptions.indexOf(option);
+                var optionBadge = _this.getBadgeConfig(badge, option);
                 return render("option/".concat(key), {
                     label: option[labelField || 'label'],
                     icon: option.icon,
                     size: option.size || size,
+                    badge: optionBadge,
                     type: 'button',
                     block: block
                 }, {
@@ -77,7 +86,8 @@ var ButtonGroupControl = /** @class */ (function (_super) {
         }
         else if (Array.isArray(buttons)) {
             body = buttons.map(function (button, key) {
-                return render("button/".concat(key), tslib.__assign({ size: size, block: block, activeLevel: btnActiveLevel, level: btnLevel, disabled: disabled }, button), {
+                var buttonBadge = _this.getBadgeConfig(badge, button);
+                return render("button/".concat(key), tslib.__assign(tslib.__assign({ size: size, block: block, activeLevel: btnActiveLevel, level: btnLevel, disabled: disabled }, button), { badge: buttonBadge }), {
                     key: key,
                     className: cx(button.className, btnClassName)
                 });