amis 2.7.2 → 2.8.0

package/lib/renderers/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -60,22 +60,32 @@ function recoverFunctionType(config) {
         'sort',
         'renderItem'
     ].forEach(function (key) {
+        var e_1, _a;
         var objects = amisCore.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 = tslib.__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) {
@@ -187,12 +197,12 @@ var Chart = /** @class */ (function (_super) {
                 // @ts-ignore 官方没提供 type
                 Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['echarts/extension/bmap/bmap'], function(mod) {fullfill(tslib.__importStar(mod))})})})
             ]).then(function (_a) {
-                var echarts = _a[0], ecStat = _a[1];
+                var _b = tslib.__read(_a, 2), echarts = _b[0], ecStat = _b[1];
                 return tslib.__awaiter(_this, void 0, void 0, function () {
                     var mapGeoResult, theme;
                     var _this = this;
-                    return tslib.__generator(this, function (_b) {
-                        switch (_b.label) {
+                    return tslib.__generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0:
                                 window.echarts = echarts;
                                 window.ecStat = (ecStat === null || ecStat === void 0 ? void 0 : ecStat.default) || ecStat;
@@ -205,18 +215,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*/, amisCore.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) {
@@ -226,8 +236,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);
@@ -237,8 +247,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/lib/renderers/Code.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -113,9 +113,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;
         }
@@ -124,22 +125,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__default["default"]((_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__default["default"]((_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 = tslib.__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/lib/renderers/Collapse.js

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

package/lib/renderers/CollapseGroup.js

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

package/lib/renderers/Color.js

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

package/lib/renderers/Container.d.ts

@@ -92,7 +92,7 @@ export default class Container<T> extends React.Component<ContainerProps & T, ob
     static defaultProps: {
         className: string;
         draggableConfig: {
-            axis: "x" | "y" | "both" | undefined;
+            axis: "both" | "x" | "y" | undefined;
             scale: number;
             enableUserSelect: boolean;
         };

package/lib/renderers/Container.js

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

package/lib/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/lib/renderers/Copyable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -34,15 +34,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 = amisCore.filter(copyable.content ||
-                        '${' + name + ' | raw }', data);
+                    var content = amisCore.filter(copyable.content || '${' + name + ' | raw }', data);
+                    var tooltip = (copyable === null || copyable === void 0 ? void 0 : copyable.tooltip) != null
+                        ? amisCore.filter(copyable.tooltip, data)
+                        : copyable === null || copyable === void 0 ? void 0 : copyable.tooltip;
                     if (content) {
                         return (React__default["default"].createElement(Component, tslib.__assign({}, this.props, { className: cx("Field--copyable", className) }),
-                            React__default["default"].createElement(Component, tslib.__assign({}, this.props, { wrapperComponent: '', noHoc: true })),
-                            React__default["default"].createElement(amisUi.TooltipWrapper, { placement: "right", tooltip: '点击复制', trigger: "hover" },
-                                React__default["default"].createElement("a", { key: "edit-btn", "data-tooltip": __('Copyable.tip'), className: cx('Field-copyBtn'), onClick: this.handleClick.bind(this, content) },
+                            React__default["default"].createElement(Component, tslib.__assign({}, this.props, { contentsOnly: true, noHoc: true })),
+                            React__default["default"].createElement(amisUi.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__default["default"].createElement("a", { key: "edit-btn", className: cx('Field-copyBtn'), onClick: this.handleClick.bind(this, content) },
                                     React__default["default"].createElement(amisUi.Icon, { icon: "copy", className: "icon" })))));
                     }
                 }

package/lib/renderers/Custom.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -30,7 +30,7 @@ var getFunction = memoize__default["default"](function () {
     for (var _i = 0; _i < arguments.length; _i++) {
         args[_i] = arguments[_i];
     }
-    return new (Function.bind.apply(Function, tslib.__spreadArray([void 0], args, false)))();
+    return new (Function.bind.apply(Function, tslib.__spreadArray([void 0], tslib.__read(args), false)))();
 }, function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {

package/lib/renderers/Date.js

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

package/lib/renderers/DateRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -30,7 +30,7 @@ var DateRangeField = /** @class */ (function (_super) {
         if (typeof value === 'string') {
             value = value.split(delimiter);
         }
-        var _e = value[0], startTime = _e === void 0 ? '' : _e, _f = value[1], endTime = _f === void 0 ? '' : _f;
+        var _e = tslib.__read(value, 2), _f = _e[0], startTime = _f === void 0 ? '' : _f, _g = _e[1], endTime = _g === void 0 ? '' : _g;
         if (valueFormat) {
             startTime = moment__default["default"](startTime, valueFormat);
             endTime = moment__default["default"](endTime, valueFormat);