amis 2.7.3-beta.0 → 2.9.0

package/esm/renderers/Card.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
-import { __extends, __assign, __rest, __decorate, __metadata, __spreadArray } from 'tslib';
+import { __extends, __assign, __rest, __decorate, __metadata, __spreadArray, __read } from 'tslib';
 import React from 'react';
 import omit from 'lodash/omit';
-import { filter, evalExpression, noop, padArr, isVisible, isDisabled, resolveVariable, hashCode, resolveVariableAndFilter, Renderer } from 'amis-core';
+import { filter, evalExpression, padArr, isVisible, isDisabled, resolveVariable, hashCode, resolveVariableAndFilter, Renderer } from 'amis-core';
 import { Checkbox, Icon, Card } from 'amis-ui';
 import { HocQuickEdit } from './QuickEdit.js';
 import { HocPopOver } from './PopOver.js';
@@ -31,7 +31,7 @@ var CardRenderer = /** @class */ (function (_super) {
         return href || itemAction || onCheck || (checkOnItemClick && checkable);
     };
     CardRenderer.prototype.handleClick = function (e) {
-        var _a = this.props, item = _a.item, href = _a.href, data = _a.data, env = _a.env, blank = _a.blank, itemAction = _a.itemAction, onAction = _a.onAction, onCheck = _a.onCheck, selectable = _a.selectable;
+        var _a = this.props, item = _a.item, href = _a.href, data = _a.data, env = _a.env, blank = _a.blank, itemAction = _a.itemAction, onAction = _a.onAction, onCheck = _a.onCheck, selectable = _a.selectable, checkOnItemClick = _a.checkOnItemClick;
         if (href) {
             env.jumpTo(filter(href, data), {
                 type: 'button',
@@ -44,13 +44,18 @@ var CardRenderer = /** @class */ (function (_super) {
             onAction && onAction(e, itemAction, (item === null || item === void 0 ? void 0 : item.data) || data);
             return;
         }
-        selectable && (onCheck === null || onCheck === void 0 ? void 0 : onCheck(item));
+        selectable && checkOnItemClick && (onCheck === null || onCheck === void 0 ? void 0 : onCheck(item));
     };
     CardRenderer.prototype.handleAction = function (e, action, ctx) {
         var _a = this.props, onAction = _a.onAction, item = _a.item;
         onAction && onAction(e, action, ctx || item.data);
     };
-    CardRenderer.prototype.handleCheck = function (e) {
+    CardRenderer.prototype.handleCheck = function () {
+        // 因为如果 checkOnItemClick 开启
+        // 会把状态标记为选中，如果这里继续执行则又会改回来
+        if (this.props.checkOnItemClick) {
+            return;
+        }
         var item = this.props.item;
         this.props.onCheck && this.props.onCheck(item);
     };
@@ -63,7 +68,7 @@ var CardRenderer = /** @class */ (function (_super) {
             onQuickChange(item, values, saveImmediately, savePristine, options);
     };
     CardRenderer.prototype.renderToolbar = function () {
-        var _a = this.props, selectable = _a.selectable, checkable = _a.checkable, selected = _a.selected, checkOnItemClick = _a.checkOnItemClick, multiple = _a.multiple, hideCheckToggler = _a.hideCheckToggler, cx = _a.classnames, toolbar = _a.toolbar, render = _a.render, dragging = _a.dragging, data = _a.data, header = _a.header;
+        var _a = this.props, selectable = _a.selectable, checkable = _a.checkable, selected = _a.selected, multiple = _a.multiple, hideCheckToggler = _a.hideCheckToggler, cx = _a.classnames, toolbar = _a.toolbar, render = _a.render, dragging = _a.dragging, data = _a.data, header = _a.header;
         var toolbars = [];
         if (header) {
             var highlightClassName = header.highlightClassName, highlight = header.highlight;
@@ -74,7 +79,7 @@ var CardRenderer = /** @class */ (function (_super) {
             }
         }
         if (selectable && !hideCheckToggler) {
-            toolbars.push(React.createElement(Checkbox, { key: "check", className: cx('Card-checkbox'), type: multiple ? 'checkbox' : 'radio', disabled: !checkable, checked: selected, onChange: checkOnItemClick ? noop : this.handleCheck }));
+            toolbars.push(React.createElement(Checkbox, { key: "check", className: cx('Card-checkbox'), type: multiple !== false ? 'checkbox' : 'radio', disabled: !checkable, checked: selected, onChange: this.handleCheck }));
         }
         if (Array.isArray(toolbar)) {
             toolbar.forEach(function (action, index) {
@@ -338,7 +343,7 @@ var CardRenderer = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     CardItemFieldRenderer.prototype.render = function () {
-        var _a = this.props; _a.type; var className = _a.className, render = _a.render, style = _a.style, Component = _a.wrapperComponent; _a.labelClassName; var value = _a.value, data = _a.data, children = _a.children, width = _a.width, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, field = _a.field, useCardLabel = _a.useCardLabel, rest = __rest(_a, ["type", "className", "render", "style", "wrapperComponent", "labelClassName", "value", "data", "children", "width", "innerClassName", "label", "tabIndex", "onKeyUp", "field", "useCardLabel"]);
+        var _a = this.props; _a.type; var className = _a.className, render = _a.render, style = _a.style, Component = _a.wrapperComponent, contentsOnly = _a.contentsOnly; _a.labelClassName; var value = _a.value, data = _a.data, children = _a.children, width = _a.width, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, field = _a.field, useCardLabel = _a.useCardLabel, rest = __rest(_a, ["type", "className", "render", "style", "wrapperComponent", "contentsOnly", "labelClassName", "value", "data", "children", "width", "innerClassName", "label", "tabIndex", "onKeyUp", "field", "useCardLabel"]);
         var schema = __assign(__assign({}, field), { 
             /** 针对带有label的表单项组件，默认不渲染组件自带的label，否则会出现重复的label */
             renderLabel: !useCardLabel, className: innerClassName, type: (field && field.type) || 'plain' });
@@ -350,9 +355,10 @@ var CardRenderer = /** @class */ (function (_super) {
             style.width = style.width || width;
             body = (React.createElement("div", { style: { width: !/%/.test(String(width)) ? width : '' } }, body));
         }
-        if (!Component) {
+        if (contentsOnly) {
             return body;
         }
+        Component = Component || 'div';
         return (React.createElement(Component, { style: style, className: className, tabIndex: tabIndex, onKeyUp: onKeyUp }, body));
     };
     CardItemFieldRenderer.defaultProps = __assign(__assign({}, TableCell.defaultProps), { wrapperComponent: 'div' });
@@ -362,7 +368,7 @@ var CardRenderer = /** @class */ (function (_super) {
         'popOver',
         'copyable',
         'inline'
-    ], TableCell.propsList, true);
+    ], __read(TableCell.propsList), false);
     CardItemFieldRenderer = __decorate([
         Renderer({
             type: 'card-item-field'

package/esm/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/esm/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/esm/renderers/Carousel.d.ts

@@ -59,6 +59,23 @@ export interface CarouselSchema extends BaseSchema {
      * 配置固定值
      */
     options?: Array<any>;
+    /**
+     * 是否一直显示箭头
+     */
+    alwaysShowArrow?: boolean;
+    /**
+     * 多图模式配置项
+     */
+    multiple?: {
+        count: number;
+    };
+    /**
+     * 自定义箭头图标
+     */
+    icons?: {
+        prev?: SchemaCollection;
+        next?: SchemaCollection;
+    };
 }
 export interface CarouselProps extends RendererProps, Omit<CarouselSchema, 'className'> {
     value?: any;
@@ -72,12 +89,13 @@ export declare class Carousel extends React.Component<CarouselProps, CarouselSta
     wrapperRef: React.RefObject<HTMLDivElement>;
     intervalTimeout: NodeJS.Timer | number;
     durationTimeout: NodeJS.Timer | number;
-    static defaultProps: Pick<CarouselProps, 'auto' | 'interval' | 'duration' | 'controlsTheme' | 'animation' | 'controls' | 'placeholder'>;
+    static defaultProps: Pick<CarouselProps, 'auto' | 'interval' | 'duration' | 'controlsTheme' | 'animation' | 'controls' | 'placeholder' | 'multiple' | 'alwaysShowArrow'>;
     state: {
         current: number;
         options: any;
         nextAnimation: string;
     };
+    loading: boolean;
     componentDidMount(): void;
     componentDidUpdate(prevProps: CarouselProps): void;
     componentWillUnmount(): void;
@@ -94,6 +112,7 @@ export declare class Carousel extends React.Component<CarouselProps, CarouselSta
     renderArrows(): JSX.Element;
     handleMouseEnter(): void;
     handleMouseLeave(): void;
+    getNewOptions(options: any, count?: number): any[];
     render(): JSX.Element;
 }
 export declare class CarouselRenderer extends Carousel {

package/esm/renderers/Carousel.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
-import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __read, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import Transition, { ENTERING, ENTERED, EXITING } from 'react-transition-group/Transition';
-import { getPropValue, isArrayChildrenModified, resolveVariableAndFilter, createObject, isObject, autobind, ScopedContext, Renderer } from 'amis-core';
+import Transition, { ENTERING, ENTERED, EXITING, EXITED } from 'react-transition-group/Transition';
+import { getPropValue, isArrayChildrenModified, resolveVariableAndFilter, createObject, autobind, ScopedContext, Renderer, isObject } from 'amis-core';
 import { Icon, Html } from 'amis-ui';
 import ThemedImageThumb from './Image.js';
 
@@ -35,6 +35,7 @@ var Carousel = /** @class */ (function (_super) {
             options: _this.props.options || getPropValue(_this.props) || [],
             nextAnimation: ''
         };
+        _this.loading = false;
         return _this;
     }
     Carousel.prototype.componentDidMount = function () {
@@ -141,9 +142,17 @@ var Carousel = /** @class */ (function (_super) {
         }
     };
     Carousel.prototype.next = function () {
+        var multiple = this.props.multiple;
+        if (this.loading && multiple && multiple.count > 1) {
+            return;
+        }
         this.autoSlide('next');
     };
     Carousel.prototype.prev = function () {
+        var multiple = this.props.multiple;
+        if (this.loading && multiple && multiple.count > 1) {
+            return;
+        }
         this.autoSlide('prev');
     };
     Carousel.prototype.clearAutoTimeout = function () {
@@ -152,12 +161,15 @@ var Carousel = /** @class */ (function (_super) {
     };
     Carousel.prototype.changeSlide = function (index) {
         return __awaiter(this, void 0, void 0, function () {
-            var current, _a, dispatchEvent, data, rendererEvent;
+            var current, _a, dispatchEvent, data, multiple, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         current = this.state.current;
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, multiple = _a.multiple;
+                        if (this.loading && multiple && multiple.count > 1) {
+                            return [2 /*return*/];
+                        }
                         return [4 /*yield*/, dispatchEvent('change', createObject(data, {
                                 activeIndex: index,
                                 prevIndex: current
@@ -190,46 +202,106 @@ var Carousel = /** @class */ (function (_super) {
                 React.createElement(Icon, { icon: "right-arrow", className: "icon" }))));
     };
     Carousel.prototype.handleMouseEnter = function () {
+        var multiple = this.props.multiple;
+        if (multiple && multiple.count > 1) {
+            return;
+        }
         this.clearAutoTimeout();
     };
     Carousel.prototype.handleMouseLeave = function () {
+        var multiple = this.props.multiple;
+        if (multiple && multiple.count > 1) {
+            return;
+        }
         this.prepareAutoSlide();
     };
+    // 处理options
+    Carousel.prototype.getNewOptions = function (options, count) {
+        if (count === void 0) { count = 1; }
+        var newOptions = options;
+        if (Array.isArray(options) && options.length) {
+            newOptions = new Array(options.length);
+            for (var i = 0; i < options.length; i++) {
+                newOptions[i] = new Array(count);
+                for (var j = 0; j < count; j++) {
+                    newOptions[i][j] = options[(i + j) % options.length];
+                }
+            }
+        }
+        return newOptions;
+    };
     Carousel.prototype.render = function () {
+        var _a;
         var _this = this;
-        var _a = this.props, render = _a.render, className = _a.className, style = _a.style, cx = _a.classnames, itemSchema = _a.itemSchema, animation = _a.animation, width = _a.width, height = _a.height, controls = _a.controls, controlsTheme = _a.controlsTheme, placeholder = _a.placeholder, data = _a.data, name = _a.name;
-        var _b = this.state, options = _b.options, current = _b.current, nextAnimation = _b.nextAnimation;
+        var _b = this.props, render = _b.render, className = _b.className, style = _b.style, cx = _b.classnames, itemSchema = _b.itemSchema, animation = _b.animation, width = _b.width, height = _b.height, controls = _b.controls, controlsTheme = _b.controlsTheme, placeholder = _b.placeholder, data = _b.data, name = _b.name, duration = _b.duration, multiple = _b.multiple, alwaysShowArrow = _b.alwaysShowArrow, icons = _b.icons;
+        var _c = this.state, options = _c.options, current = _c.current, nextAnimation = _c.nextAnimation;
         var body = null;
         var carouselStyles = style || {};
         width ? (carouselStyles.width = width + 'px') : '';
         height ? (carouselStyles.height = height + 'px') : '';
-        var _c = [
+        var _d = __read([
             controls.indexOf('dots') > -1,
             controls.indexOf('arrows') > -1
-        ], dots = _c[0], arrows = _c[1];
+        ], 2), dots = _d[0], arrows = _d[1];
         var animationName = nextAnimation || animation;
         if (Array.isArray(options) && options.length) {
-            body = (React.createElement("div", { ref: this.wrapperRef, className: cx('Carousel-container'), onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave }, options.map(function (option, key) { return (React.createElement(Transition, { mountOnEnter: true, unmountOnExit: true, in: key === current, timeout: 500, key: key }, function (status) {
+            var multipleCount_1 = 1;
+            if (multiple && typeof multiple.count === 'number' && multiple.count >= 2) {
+                multipleCount_1 = Math.floor(multiple.count) < options.length ? Math.floor(multiple.count) : options.length;
+            }
+            var newOptions_1 = this.getNewOptions(options, multipleCount_1);
+            var transitionDuration_1 = multipleCount_1 > 1 && typeof duration === 'number'
+                ? "".concat(duration, "ms") : (duration || '500ms');
+            var timeout_1 = multipleCount_1 > 1 && typeof duration === 'number' ? duration : 500;
+            body = (React.createElement("div", { ref: this.wrapperRef, className: cx('Carousel-container'), onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave }, options.map(function (option, key) { return (React.createElement(Transition, { mountOnEnter: true, unmountOnExit: true, in: key === current, timeout: timeout_1, key: key }, function (status) {
                 var _a;
                 if (status === ENTERING) {
                     _this.wrapperRef.current &&
                         _this.wrapperRef.current.childNodes.forEach(function (item) { return item.offsetHeight; });
                 }
-                return (React.createElement("div", { className: cx('Carousel-item', animationName, animationStyles[status]) }, render("".concat(current, "/body"), itemSchema ? itemSchema : defaultSchema, {
-                    thumbMode: _this.props.thumbMode,
-                    data: createObject(data, isObject(option)
-                        ? option
-                        : (_a = { item: option }, _a[name] = option, _a))
-                })));
+                if (multipleCount_1 > 1) {
+                    if ((status === ENTERING || status === EXITING) && !_this.loading) {
+                        _this.loading = true;
+                    }
+                    else if ((status === ENTERED || status === EXITED) && _this.loading) {
+                        _this.loading = false;
+                    }
+                }
+                var transformStyles = (_a = {},
+                    _a[ENTERING] = 0,
+                    _a[ENTERED] = 0,
+                    _a[EXITING] = animationName === 'slideRight' ? 100 / multipleCount_1 : -100 / multipleCount_1,
+                    _a[EXITED] = animationName === 'slideRight' ? -100 / multipleCount_1 : 100 / multipleCount_1,
+                    _a);
+                var itemStyle = multipleCount_1 > 1 ? __assign({ transitionTimingFunction: 'linear', transitionDuration: transitionDuration_1 }, (animation === 'slide' ? { transform: "translateX(".concat(transformStyles[status], "%)") } : {})) : {};
+                var itemRender = function (option) {
+                    var _a;
+                    return render("".concat(current, "/body"), itemSchema ? itemSchema : defaultSchema, {
+                        thumbMode: _this.props.thumbMode,
+                        data: createObject(data, isObject(option)
+                            ? option
+                            : (_a = { item: option }, _a[name] = option, _a))
+                    });
+                };
+                return (React.createElement("div", { className: cx('Carousel-item', animationName, animationStyles[status]), style: itemStyle },
+                    multipleCount_1 === 1 ? itemRender(option) : null,
+                    multipleCount_1 > 1 ?
+                        newOptions_1[key].map(function (option, index) { return (React.createElement("div", { key: index, style: {
+                                width: 100 / multipleCount_1 + '%',
+                                height: '100%',
+                                float: 'left'
+                            } }, itemRender(option))); }) : null));
             })); })));
         }
-        return (React.createElement("div", { className: cx("Carousel Carousel--".concat(controlsTheme), className), style: carouselStyles },
+        return (React.createElement("div", { className: cx("Carousel Carousel--".concat(controlsTheme), (_a = {}, _a['Carousel-arrow--always'] = !!alwaysShowArrow, _a), className), style: carouselStyles },
             body ? body : placeholder,
             dots ? this.renderDots() : null,
-            arrows ? (React.createElement("div", { className: cx('Carousel-leftArrow'), onClick: this.prev },
-                React.createElement(Icon, { icon: "left-arrow", className: "icon" }))) : null,
-            arrows ? (React.createElement("div", { className: cx('Carousel-rightArrow'), onClick: this.next },
-                React.createElement(Icon, { icon: "right-arrow", className: "icon" }))) : null));
+            arrows ? (React.createElement("div", { className: cx('Carousel-leftArrow'), onClick: this.prev }, icons && icons.prev
+                ? React.isValidElement(icons.prev) ? icons.prev : render('arrow-prev', icons.prev)
+                : (React.createElement(Icon, { icon: "left-arrow", className: "icon" })))) : null,
+            arrows ? (React.createElement("div", { className: cx('Carousel-rightArrow'), onClick: this.next }, icons && icons.next
+                ? React.isValidElement(icons.next) ? icons.next : render('arrow-next', icons.next)
+                : (React.createElement(Icon, { icon: "right-arrow", className: "icon" })))) : null));
     };
     Carousel.defaultProps = {
         auto: true,
@@ -238,7 +310,9 @@ var Carousel = /** @class */ (function (_super) {
         controlsTheme: 'light',
         animation: 'fade',
         controls: ['dots', 'arrows'],
-        placeholder: '-'
+        placeholder: '-',
+        multiple: { count: 1 },
+        alwaysShowArrow: false
     };
     __decorate([
         autobind,

package/esm/renderers/Chart.js

@@ -1,9 +1,9 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
-import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __read, __decorate, __metadata, __values } from 'tslib';
 import React from 'react';
 import { isApiOutdated, isPureVariable, resolveVariableAndFilter, filter, createObject, resizeSensor, loadScript, isEffectiveApi, normalizeApiResponseData, dataMapping, LazyComponent, ScopedContext, Renderer, ServiceStore, findObjectsWithKey } from 'amis-core';
 import cx from 'classnames';
@@ -49,22 +49,32 @@ function recoverFunctionType(config) {
         'sort',
         'renderItem'
     ].forEach(function (key) {
+        var e_1, _a;
         var objects = findObjectsWithKey(config, key);
-        for (var _i = 0, objects_1 = objects; _i < objects_1.length; _i++) {
-            var object = objects_1[_i];
-            var code = object[key];
-            if (typeof code === 'string' && code.trim().startsWith('function')) {
-                try {
-                    if (!(code in EVAL_CACHE)) {
-                        EVAL_CACHE[code] = eval('(' + code + ')');
+        try {
+            for (var objects_1 = __values(objects), objects_1_1 = objects_1.next(); !objects_1_1.done; objects_1_1 = objects_1.next()) {
+                var object = objects_1_1.value;
+                var code = object[key];
+                if (typeof code === 'string' && code.trim().startsWith('function')) {
+                    try {
+                        if (!(code in EVAL_CACHE)) {
+                            EVAL_CACHE[code] = eval('(' + code + ')');
+                        }
+                        object[key] = EVAL_CACHE[code];
+                    }
+                    catch (e) {
+                        console.warn(code, e);
                     }
-                    object[key] = EVAL_CACHE[code];
-                }
-                catch (e) {
-                    console.warn(code, e);
                 }
             }
         }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (objects_1_1 && !objects_1_1.done && (_a = objects_1.return)) _a.call(objects_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
     });
 }
 var Chart = /** @class */ (function (_super) {
@@ -176,12 +186,12 @@ var Chart = /** @class */ (function (_super) {
                 // @ts-ignore 官方没提供 type
                 import('echarts/extension/bmap/bmap')
             ]).then(function (_a) {
-                var echarts = _a[0], ecStat = _a[1];
+                var _b = __read(_a, 2), echarts = _b[0], ecStat = _b[1];
                 return __awaiter(_this, void 0, void 0, function () {
                     var mapGeoResult, theme;
                     var _this = this;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
+                    return __generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0:
                                 window.echarts = echarts;
                                 window.ecStat = (ecStat === null || ecStat === void 0 ? void 0 : ecStat.default) || ecStat;
@@ -194,18 +204,18 @@ var Chart = /** @class */ (function (_super) {
                                 }
                                 return [4 /*yield*/, env.fetcher(mapURL, data)];
                             case 1:
-                                mapGeoResult = _b.sent();
+                                mapGeoResult = _c.sent();
                                 if (!mapGeoResult.ok) {
                                     console.warn('fetch map geo error ' + mapURL);
                                 }
                                 echarts.registerMap(mapName, mapGeoResult.data);
-                                _b.label = 2;
+                                _c.label = 2;
                             case 2:
                                 if (!loadBaiduMap) return [3 /*break*/, 4];
                                 return [4 /*yield*/, loadScript("//api.map.baidu.com/api?v=3.0&ak=".concat(this.props.ak, "&callback={{callback}}"))];
                             case 3:
-                                _b.sent();
-                                _b.label = 4;
+                                _c.sent();
+                                _c.label = 4;
                             case 4:
                                 theme = 'default';
                                 if (chartTheme) {
@@ -215,8 +225,8 @@ var Chart = /** @class */ (function (_super) {
                                 if (!onChartWillMount) return [3 /*break*/, 6];
                                 return [4 /*yield*/, onChartWillMount(echarts)];
                             case 5:
-                                _b.sent();
-                                _b.label = 6;
+                                _c.sent();
+                                _c.label = 6;
                             case 6:
                                 if (ecStat.transform) {
                                     echarts.registerTransform(ecStat.transform.regression);
@@ -226,8 +236,8 @@ var Chart = /** @class */ (function (_super) {
                                 if (!env.loadChartExtends) return [3 /*break*/, 8];
                                 return [4 /*yield*/, env.loadChartExtends()];
                             case 7:
-                                _b.sent();
-                                _b.label = 8;
+                                _c.sent();
+                                _c.label = 8;
                             case 8:
                                 this.echarts = echarts.init(ref, theme);
                                 if (typeof onChartMount === 'string') {

package/esm/renderers/Code.js

@@ -1,9 +1,9 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
-import { __extends, __awaiter, __generator, __decorate } from 'tslib';
+import { __extends, __awaiter, __generator, __values, __decorate } from 'tslib';
 import React from 'react';
 import isPlainObject from 'lodash/isPlainObject';
 import { anyChanged, getPropValue, isPureVariable, resolveVariableAndFilter, Renderer } from 'amis-core';
@@ -104,9 +104,10 @@ var Code = /** @class */ (function (_super) {
     };
     /** 注册并返回当前主题名称，如果未自定义主题，则范围editorTheme值，默认为'vs' */
     Code.prototype.registerAndGetTheme = function () {
-        var _a, _b;
+        var e_1, _a;
+        var _b, _c;
         var monaco = this.monaco;
-        var _c = this.props.editorTheme, editorTheme = _c === void 0 ? 'vs' : _c;
+        var _d = this.props.editorTheme, editorTheme = _d === void 0 ? 'vs' : _d;
         if (!monaco) {
             return editorTheme;
         }
@@ -115,22 +116,31 @@ var Code = /** @class */ (function (_super) {
             Array.isArray(this.customLang.tokens) &&
             this.customLang.tokens.length) {
             var langName = this.customLang.name;
-            var colors = ((_a = this.customLang) === null || _a === void 0 ? void 0 : _a.colors) && isPlainObject((_b = this.customLang) === null || _b === void 0 ? void 0 : _b.colors)
+            var colors = ((_b = this.customLang) === null || _b === void 0 ? void 0 : _b.colors) && isPlainObject((_c = this.customLang) === null || _c === void 0 ? void 0 : _c.colors)
                 ? this.customLang.colors
                 : {};
             monaco.languages.register({ id: langName });
             var tokenizers = [];
             var rules = [];
-            for (var _i = 0, _d = this.customLang.tokens; _i < _d.length; _i++) {
-                var token = _d[_i];
-                var regex = new RegExp(token.regex, token.regexFlags || undefined);
-                tokenizers.push([regex, token.name]);
-                rules.push({
-                    token: token.name,
-                    foreground: token.color,
-                    background: token.background,
-                    fontStyle: token.fontStyle
-                });
+            try {
+                for (var _e = __values(this.customLang.tokens), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    var token = _f.value;
+                    var regex = new RegExp(token.regex, token.regexFlags || undefined);
+                    tokenizers.push([regex, token.name]);
+                    rules.push({
+                        token: token.name,
+                        foreground: token.color,
+                        background: token.background,
+                        fontStyle: token.fontStyle
+                    });
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+                }
+                finally { if (e_1) throw e_1.error; }
             }
             monaco.languages.setMonarchTokensProvider(langName, {
                 tokenizer: {

package/esm/renderers/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/esm/renderers/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/esm/renderers/Color.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/esm/renderers/Container.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/esm/renderers/Copyable.d.ts

@@ -14,12 +14,17 @@ export interface SchemaCopyableObject {
      * 配置复制时的内容模板。
      */
     content?: SchemaTpl;
+    /**
+     * 提示文字内容
+     */
+    tooltip?: string;
 }
 export type SchemaCopyable = boolean | SchemaCopyableObject;
 export interface CopyableProps extends RendererProps {
     name?: string;
     label?: string;
     copyable: SchemaCopyable;
+    tooltipContainer?: any;
 }
 export declare const HocCopyable: () => (Component: React.ComponentType<any>) => any;
 export default HocCopyable;

package/esm/renderers/Copyable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -25,15 +25,18 @@ var HocCopyable = function () {
                 env.copy && env.copy(content, { format: copyFormat });
             };
             QuickEditComponent.prototype.render = function () {
-                var _a = this.props, copyable = _a.copyable, name = _a.name, className = _a.className, data = _a.data, noHoc = _a.noHoc, cx = _a.classnames, __ = _a.translate;
+                var _a = this.props, name = _a.name, className = _a.className, data = _a.data, noHoc = _a.noHoc, cx = _a.classnames, __ = _a.translate, env = _a.env, tooltipContainer = _a.tooltipContainer;
+                var copyable = this.props.copyable;
                 if (copyable && !noHoc) {
-                    var content = filter(copyable.content ||
-                        '${' + name + ' | raw }', data);
+                    var content = filter(copyable.content || '${' + name + ' | raw }', data);
+                    var tooltip = (copyable === null || copyable === void 0 ? void 0 : copyable.tooltip) != null
+                        ? filter(copyable.tooltip, data)
+                        : copyable === null || copyable === void 0 ? void 0 : copyable.tooltip;
                     if (content) {
                         return (React.createElement(Component, __assign({}, this.props, { className: cx("Field--copyable", className) }),
-                            React.createElement(Component, __assign({}, this.props, { wrapperComponent: '', noHoc: true })),
-                            React.createElement(TooltipWrapper, { placement: "right", tooltip: '点击复制', trigger: "hover" },
-                                React.createElement("a", { key: "edit-btn", "data-tooltip": __('Copyable.tip'), className: cx('Field-copyBtn'), onClick: this.handleClick.bind(this, content) },
+                            React.createElement(Component, __assign({}, this.props, { contentsOnly: true, noHoc: true })),
+                            React.createElement(TooltipWrapper, { placement: "right", tooltip: tooltip !== null && tooltip !== void 0 ? tooltip : __('Copyable.tip'), trigger: "hover", container: tooltipContainer || (env === null || env === void 0 ? void 0 : env.getModalContainer) },
+                                React.createElement("a", { key: "edit-btn", className: cx('Field-copyBtn'), onClick: this.handleClick.bind(this, content) },
                                     React.createElement(Icon, { icon: "copy", className: "icon" })))));
                     }
                 }

package/esm/renderers/Custom.js

@@ -1,9 +1,9 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
-import { __spreadArray, __extends, __decorate } from 'tslib';
+import { __spreadArray, __read, __extends, __decorate } from 'tslib';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import memoize from 'lodash/memoize';
@@ -18,7 +18,7 @@ var getFunction = memoize(function () {
     for (var _i = 0; _i < arguments.length; _i++) {
         args[_i] = arguments[_i];
     }
-    return new (Function.bind.apply(Function, __spreadArray([void 0], args, false)))();
+    return new (Function.bind.apply(Function, __spreadArray([void 0], __read(args), false)))();
 }, function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {