npm - amis - Versions diffs - 2.5.4-alpha.4 → 2.6.0 - Mend

@@ -1,6 +1,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
 import { SchemaNode, ActionObject } from 'amis-core';
+import { SpinnerExtraProps } from 'amis-ui';
 import { IListStore } from 'amis-core';
 import { Action } from '../types';
 import Sortable from 'sortablejs';
@@ -12,7 +13,7 @@ import type { IItem } from 'amis-core/lib/store/list';
  * Cards 卡片集合渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/card
  */
-export interface CardsSchema extends BaseSchema {
+export interface CardsSchema extends BaseSchema, SpinnerExtraProps {
     /**
      * 指定为 cards 类型
      */

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
@@ -473,7 +473,7 @@ var Cards = /** @class */ (function (_super) {
     };
     Cards.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, style = _a.style, store = _a.store, columnsCount = _a.columnsCount, itemClassName = _a.itemClassName, placeholder = _a.placeholder, card = _a.card, render = _a.render, affixHeader = _a.affixHeader, masonryLayout = _a.masonryLayout, itemsClassName = _a.itemsClassName, cx = _a.classnames, __ = _a.translate, _b = _a.loading, loading = _b === void 0 ? false : _b;
+        var _a = this.props, className = _a.className, style = _a.style, store = _a.store, columnsCount = _a.columnsCount, itemClassName = _a.itemClassName, placeholder = _a.placeholder, card = _a.card, render = _a.render, affixHeader = _a.affixHeader, masonryLayout = _a.masonryLayout, itemsClassName = _a.itemsClassName, cx = _a.classnames, __ = _a.translate, _b = _a.loading, loading = _b === void 0 ? false : _b, loadingConfig = _a.loadingConfig;
         this.renderedToolbars = []; // 用来记录哪些 toolbar 已经渲染了，已经渲染了就不重复渲染了。
         var itemFinalClassName = columnsCount
             ? "Grid-col--sm".concat(Math.round(12 / columnsCount))
@@ -507,7 +507,7 @@ var Cards = /** @class */ (function (_super) {
                 return _this.renderCard(index, card, item, itemFinalClassName);
             }))) : (React__default["default"].createElement("div", { className: cx('Cards-placeholder') }, render('placeholder', __(placeholder)))),
             footer,
-            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
+            React__default["default"].createElement(amisUi.Spinner, { loadingConfig: loadingConfig, overlay: true, show: loading })));
     };
     Cards.propsList = [
         'header',

@@ -127,4 +127,5 @@ export declare class ChartRenderer extends Chart {
     constructor(props: ChartProps, context: IScopedContext);
     componentWillUnmount(): void;
     setData(values: object, replace?: boolean): void;
+    getData(): any;
 }

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
@@ -229,9 +229,11 @@ var Chart = /** @class */ (function (_super) {
                                 _b.sent();
                                 _b.label = 6;
                             case 6:
-                                echarts.registerTransform(ecStat.transform.regression);
-                                echarts.registerTransform(ecStat.transform.histogram);
-                                echarts.registerTransform(ecStat.transform.clustering);
+                                if (ecStat.transform) {
+                                    echarts.registerTransform(ecStat.transform.regression);
+                                    echarts.registerTransform(ecStat.transform.histogram);
+                                    echarts.registerTransform(ecStat.transform.clustering);
+                                }
                                 if (!env.loadChartExtends) return [3 /*break*/, 8];
                                 return [4 /*yield*/, env.loadChartExtends()];
                             case 7:
@@ -429,6 +431,10 @@ var Chart = /** @class */ (function (_super) {
         // 重新渲染
         this.renderChart(this.props.config, values);
     };
+    ChartRenderer.prototype.getData = function () {
+        var store = this.props.store;
+        return store.data;
+    };
     ChartRenderer.contextType = amisCore.ScopedContext;
     ChartRenderer = tslib.__decorate([
         amisCore.Renderer({

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.4-alpha.4
+ * amis v2.6.0
  * Copyright 2018-2022 baidu
  */
@@ -177,7 +177,8 @@ var Code = /** @class */ (function (_super) {
         'editorTheme',
         'tabSize',
         'wordWrap',
-        'customLang'
+        'customLang',
+        'style'
     ];
     Code.defaultProps = {
         language: 'plaintext',

amis 2.5.4-alpha.4 → 2.6.0