amis 2.0.0 → 2.1.0

package/esm/schemaExtend.js

@@ -1,9 +1,10 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
-import { __assign } from 'tslib';
+import { __assign, __rest, __spreadArray } from 'tslib';
+import isEqual from 'lodash/isEqual';
 import { addSchemaFilter, isObject } from 'amis-core';
 
 // input-kv 实际上是 combo 的一种扩展
@@ -70,3 +71,74 @@ addSchemaFilter(function (schema, renderer, props) {
     }
     return schema;
 });
+/**
+ * 之前 input-kv 的 value 值不支持对象或数组
+ * 很多属性是给单个值设置的，比如 valuePlaceholder 导致
+ * 耦合在一起会导致配置项混乱，所以新增了这个组件专门支持 value 是对象或数组的场景
+ */
+addSchemaFilter(function (schema, renderer, props) {
+    if (schema && schema.type === 'input-kvs') {
+        var keyItem = schema.keyItem || {};
+        var valueItems = schema.valueItems || [];
+        // value 直接放在 key 下的情况
+        var flatValue_1 = false;
+        if (valueItems.length == 1) {
+            if (valueItems[0].name === '_value') {
+                flatValue_1 = true;
+            }
+        }
+        var newSchema = __assign(__assign({ draggable: true, multiple: true, multiLine: true }, schema), { pipeIn: function (data) {
+                if (!isObject(data)) {
+                    return [];
+                }
+                var arr = [];
+                Object.keys(data).forEach(function (key) {
+                    var value = data[key];
+                    if (flatValue_1) {
+                        arr.push({
+                            _key: key || '',
+                            _value: value
+                        });
+                    }
+                    else if (typeof value === 'object') {
+                        arr.push(__assign(__assign({}, value), { _key: key || '' }));
+                    }
+                });
+                return arr;
+            }, pipeOut: function (value) {
+                if (!Array.isArray(value)) {
+                    return value;
+                }
+                var obj = {};
+                value.forEach(function (item) {
+                    var _key = item._key, rest = __rest(item, ["_key"]);
+                    _key = _key !== null && _key !== void 0 ? _key : '';
+                    if (flatValue_1) {
+                        if (schema.valueIsArray) {
+                            obj[_key] = item['_value'] || [];
+                        }
+                        else {
+                            obj[_key] = item['_value'] || {};
+                        }
+                        // 数组的时候初始化会生成 [{}]，还不确定是哪生成的，先修正为 []
+                        if (isEqual(obj[_key], [{}])) {
+                            obj[_key] = [];
+                        }
+                    }
+                    else {
+                        if (schema.valueIsArray) {
+                            obj[_key] = rest || [];
+                        }
+                        else {
+                            obj[_key] = rest || {};
+                        }
+                    }
+                });
+                return obj;
+            }, items: __spreadArray([
+                __assign({ type: 'input-text', unique: true, name: '_key', required: true, validateOnChange: true }, keyItem)
+            ], valueItems, true) });
+        return newSchema;
+    }
+    return schema;
+});

package/esm/types.d.ts

@@ -31,7 +31,7 @@ export interface fetcherResult {
     headers: object;
 }
 export interface fetchOptions {
-    method?: 'get' | 'post' | 'put' | 'patch' | 'delete' | 'jsonp';
+    method?: 'get' | 'post' | 'put' | 'patch' | 'delete' | 'jsonp' | 'js';
     successMessage?: string;
     errorMessage?: string;
     autoAppend?: boolean;

package/lib/Schema.d.ts

@@ -122,7 +122,7 @@ export interface SchemaApiObject {
     /**
      * API 发送类型
      */
-    method?: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'jsonp';
+    method?: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'jsonp' | 'js';
     /**
      * API 发送目标地址
      */

package/lib/compat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/preset.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -317,16 +317,17 @@ var ActionRenderer = /** @class */ (function (_super) {
     };
     ActionRenderer.prototype.handleAction = function (e, action) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, env, onAction, data, ignoreConfirm, dispatchEvent, mergedData, confirmed, rendererEvent, rendererEvent;
+            var _a, env, onAction, data, ignoreConfirm, dispatchEvent, $schema, mergedData, hasOnEvent, confirmed, rendererEvent, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, env = _a.env, onAction = _a.onAction, data = _a.data, ignoreConfirm = _a.ignoreConfirm, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, env = _a.env, onAction = _a.onAction, data = _a.data, ignoreConfirm = _a.ignoreConfirm, dispatchEvent = _a.dispatchEvent, $schema = _a.$schema;
                         mergedData = data;
                         if ((action === null || action === void 0 ? void 0 : action.actionType) === 'click' && amisCore.isObject(action === null || action === void 0 ? void 0 : action.args)) {
                             mergedData = amisCore.createObject(data, action.args);
                         }
-                        if (!(!ignoreConfirm && action.confirmText && env.confirm)) return [3 /*break*/, 6];
+                        hasOnEvent = $schema.onEvent && Object.keys($schema.onEvent).length;
+                        if (!((!ignoreConfirm || hasOnEvent) && action.confirmText && env.confirm)) return [3 /*break*/, 6];
                         return [4 /*yield*/, env.confirm(amisCore.filter(action.confirmText, mergedData))];
                     case 1:
                         confirmed = _b.sent();
@@ -338,8 +339,10 @@ var ActionRenderer = /** @class */ (function (_super) {
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, onAction(e, action, mergedData)];
+                        // 因为crud里面也会处理二次确认，所以如果按钮处理过了就跳过crud的二次确认
+                        return [4 /*yield*/, onAction(e, tslib.__assign(tslib.__assign({}, action), { ignoreConfirm: !!hasOnEvent }), mergedData)];
                     case 3:
+                        // 因为crud里面也会处理二次确认，所以如果按钮处理过了就跳过crud的二次确认
                         _b.sent();
                         return [3 /*break*/, 5];
                     case 4:

package/lib/renderers/Alert.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/App.d.ts

@@ -96,6 +96,14 @@ export interface AppSchema extends BaseSchema {
      * 显示面包屑路径。
      */
     showBreadcrumb?: boolean;
+    /**
+     * 显示面包屑完整路径。
+     */
+    showFullBreadcrumbPath?: boolean;
+    /**
+     * 显示面包屑首页路径。
+     */
+    showBreadcrumbHomePath?: boolean;
 }
 export interface AppProps extends RendererProps, Omit<AppSchema, 'type' | 'className'> {
     children?: JSX.Element | ((props?: any) => JSX.Element);

package/lib/renderers/App.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -19,13 +19,22 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var App = /** @class */ (function (_super) {
     tslib.__extends(App, _super);
     function App(props) {
-        var _this = _super.call(this, props) || this;
+        var _this = this;
+        var _a, _b, _c;
+        _this = _super.call(this, props) || this;
         var store = props.store;
         store.syncProps(props, undefined, ['pages']);
-        store.updateActivePage(props.env);
+        store.updateActivePage(Object.assign({}, (_a = props.env) !== null && _a !== void 0 ? _a : {}, {
+            showFullBreadcrumbPath: (_b = props.showFullBreadcrumbPath) !== null && _b !== void 0 ? _b : false,
+            showBreadcrumbHomePath: (_c = props.showBreadcrumbHomePath) !== null && _c !== void 0 ? _c : true
+        }));
         if (props.env.watchRouteChange) {
             _this.unWatchRouteChange = props.env.watchRouteChange(function () {
-                return store.updateActivePage(props.env);
+                var _a, _b, _c;
+                return store.updateActivePage(Object.assign({}, (_a = props.env) !== null && _a !== void 0 ? _a : {}, {
+                    showFullBreadcrumbPath: (_b = props.showFullBreadcrumbPath) !== null && _b !== void 0 ? _b : false,
+                    showBreadcrumbHomePath: (_c = props.showBreadcrumbHomePath) !== null && _c !== void 0 ? _c : true
+                }));
             });
         }
         return _this;
@@ -39,9 +48,10 @@ var App = /** @class */ (function (_super) {
         });
     };
     App.prototype.componentDidUpdate = function (prevProps) {
+        var _a, _b, _c;
         return tslib.__awaiter(this, void 0, void 0, function () {
             var props, store;
-            return tslib.__generator(this, function (_a) {
+            return tslib.__generator(this, function (_d) {
                 props = this.props;
                 store = props.store;
                 store.syncProps(props, prevProps, ['pages']);
@@ -49,7 +59,10 @@ var App = /** @class */ (function (_super) {
                     this.reload();
                 }
                 else if (props.location && props.location !== prevProps.location) {
-                    store.updateActivePage(props.env);
+                    store.updateActivePage(Object.assign({}, (_a = props.env) !== null && _a !== void 0 ? _a : {}, {
+                        showFullBreadcrumbPath: (_b = props.showFullBreadcrumbPath) !== null && _b !== void 0 ? _b : false,
+                        showBreadcrumbHomePath: (_c = props.showBreadcrumbHomePath) !== null && _c !== void 0 ? _c : true
+                    }));
                 }
                 return [2 /*return*/];
             });
@@ -61,26 +74,29 @@ var App = /** @class */ (function (_super) {
     };
     App.prototype.reload = function (subpath, query, ctx, silent) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, api, store, env, json;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, api, store, env, _b, showFullBreadcrumbPath, _c, showBreadcrumbHomePath, json;
+            return tslib.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         if (query) {
                             return [2 /*return*/, this.receive(query)];
                         }
-                        _a = this.props, api = _a.api, store = _a.store, env = _a.env;
+                        _a = this.props, api = _a.api, store = _a.store, env = _a.env, _b = _a.showFullBreadcrumbPath, showFullBreadcrumbPath = _b === void 0 ? false : _b, _c = _a.showBreadcrumbHomePath, showBreadcrumbHomePath = _c === void 0 ? true : _c;
                         if (!amisCore.isEffectiveApi(api, store.data)) return [3 /*break*/, 2];
                         return [4 /*yield*/, store.fetchInitData(api, store.data, {})];
                     case 1:
-                        json = _b.sent();
+                        json = _d.sent();
                         if (env.replaceText) {
                             amisCore.replaceText(json.data, env.replaceText, env.replaceTextIgnoreKeys);
                         }
                         if (json === null || json === void 0 ? void 0 : json.data.pages) {
                             store.setPages(json.data.pages);
-                            store.updateActivePage(env);
+                            store.updateActivePage(Object.assign({}, env !== null && env !== void 0 ? env : {}, {
+                                showFullBreadcrumbPath: showFullBreadcrumbPath,
+                                showBreadcrumbHomePath: showBreadcrumbHomePath
+                            }));
                         }
-                        _b.label = 2;
+                        _d.label = 2;
                     case 2: return [2 /*return*/];
                 }
             });
@@ -149,7 +165,7 @@ var App = /** @class */ (function (_super) {
         return (React__default["default"].createElement(amisUi.Layout, { header: this.renderHeader(), aside: this.renderAside(), footer: this.renderFooter(), folded: store.folded, offScreen: store.offScreen },
             store.activePage && store.schema ? (React__default["default"].createElement(React__default["default"].Fragment, null,
                 showBreadcrumb && store.bcn.length ? (React__default["default"].createElement("ul", { className: cx('AppBcn') }, store.bcn.map(function (item, index) {
-                    return (React__default["default"].createElement("li", { key: index, className: cx('AppBcn-item') }, item.path ? (React__default["default"].createElement("a", { href: item.path, onClick: _this.handleNavClick }, item.label)) : (item.label)));
+                    return (React__default["default"].createElement("li", { key: index, className: cx('AppBcn-item') }, item.path ? (React__default["default"].createElement("a", { href: item.path, onClick: _this.handleNavClick }, item.label)) : index !== store.bcn.length - 1 ? (React__default["default"].createElement("a", null, item.label)) : (item.label)));
                 }))) : null,
                 render('page', store.schema, {
                     key: "".concat((_a = store.activePage) === null || _a === void 0 ? void 0 : _a.id, "-").concat(store.schemaKey),

package/lib/renderers/Audio.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Avatar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/BarCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Breadcrumb.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/ButtonGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/CRUD.d.ts

@@ -254,7 +254,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     handleBulkAction(selectedItems: Array<any>, unSelectedItems: Array<any>, e: React.UIEvent<any>, action: ActionObject): void;
     handleItemAction(action: ActionObject, ctx: any): void;
     handleFilterInit(values: object): void;
-    handleFilterReset(values: object): void;
+    handleFilterReset(values: object, action: any): void;
     handleFilterSubmit(values: object, jumpToFirstPage?: boolean, replaceLocation?: boolean, search?: boolean): void;
     handleBulkGo(selectedItems: Array<any>, unSelectedItems: Array<any>, e: React.MouseEvent<any>): void | Promise<false | void>;
     handleDialogConfirm(values: object[], action: ActionObject, ctx: any, components: Array<any>): any;
@@ -282,7 +282,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     renderPagination(toolbar: SchemaNode): JSX.Element | null;
     renderStatistics(): JSX.Element | null;
     renderSwitchPerPage(childProps: any): JSX.Element | null;
-    renderLoadMore(): JSX.Element | "";
+    renderLoadMore(): "" | JSX.Element;
     renderFilterToggler(): JSX.Element | null;
     renderExportCSV(toolbar: Schema): JSX.Element;
     renderToolbar(toolbar?: SchemaNode, index?: number, childProps?: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): {} | null;

package/lib/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -285,7 +285,8 @@ var CRUD = /** @class */ (function (_super) {
                 onAction(e, action, ctx, false, _this.context);
             }
         };
-        if (action.confirmText && env.confirm) {
+        // Action如果配了事件动作也会处理二次确认，这里需要处理一下忽略
+        if (!action.ignoreConfirm && action.confirmText && env.confirm) {
             env
                 .confirm(amisCore.filter(action.confirmText, ctx))
                 .then(function (confirmed) { return confirmed && fn(); });
@@ -312,12 +313,17 @@ var CRUD = /** @class */ (function (_super) {
                 items: options || []
             });
     };
-    CRUD.prototype.handleFilterReset = function (values) {
+    CRUD.prototype.handleFilterReset = function (values, action) {
         var _a = this.props, store = _a.store, syncLocation = _a.syncLocation, env = _a.env, pageField = _a.pageField, perPageField = _a.perPageField;
         store.updateQuery(store.pristineQuery, syncLocation && env && env.updateLocation
             ? function (location) { return env.updateLocation(location); }
             : undefined, pageField, perPageField, true);
         this.lastQuery = store.query;
+        // 对于带 submit 的 reset(包括 actionType 为 reset-and-submit clear-and-submit 和 form 的 resetAfterSubmit 属性)
+        // 不执行 search，否则会多次触发接口请求
+        if ((action === null || action === void 0 ? void 0 : action.actionType) && ['reset-and-submit', 'clear-and-submit', 'submit'].includes(action.actionType)) {
+            return;
+        }
         this.search();
     };
     CRUD.prototype.handleFilterSubmit = function (values, jumpToFirstPage, replaceLocation, search) {
@@ -800,7 +806,10 @@ var CRUD = /** @class */ (function (_super) {
         var unSelectedItems = store.unSelectedItems;
         var bulkBtns = [];
         var itemBtns = [];
-        var ctx = store.mergedData;
+        var ctx = amisCore.createObject(store.mergedData, {
+            selectedItems: selectedItems.concat(),
+            unSelectedItems: unSelectedItems.concat()
+        });
         // const ctx = createObject(store.data, {
         //     ...store.query,
         //     items: childProps.items,

package/lib/renderers/CRUD2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -676,6 +676,12 @@ var CRUD2 = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Array, Array]),
         tslib.__metadata("design:returntype", void 0)
     ], CRUD2.prototype, "handleSelect", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Boolean]),
+        tslib.__metadata("design:returntype", void 0)
+    ], CRUD2.prototype, "handleTableQuery", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Card.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
-import { SchemaNode, ActionObject, PlainObject } from 'amis-core';
+import { SchemaNode, Schema, ActionObject, PlainObject } from 'amis-core';
 import { SchemaQuickEdit } from './QuickEdit';
 import { SchemaPopOver } from './PopOver';
 import { TableCell } from './Table';
@@ -158,6 +158,10 @@ export interface CardSchema extends BaseSchema {
      * 次要说明
      */
     secondary?: SchemaTpl;
+    /**
+     * 卡片内容区的表单项label是否使用Card内部的样式，默认为true
+     */
+    useCardLabel?: boolean;
 }
 export interface CardProps extends RendererProps, Omit<CardSchema, 'className'> {
     onCheck: (item: IItem) => void;
@@ -195,6 +199,7 @@ export declare class CardRenderer extends React.Component<CardProps> {
         checkable: boolean;
         selected: boolean;
         hideCheckToggler: boolean;
+        useCardLabel: boolean;
     };
     static propsList: Array<string>;
     constructor(props: CardProps);
@@ -208,7 +213,7 @@ export declare class CardRenderer extends React.Component<CardProps> {
     renderActions(): JSX.Element[] | undefined;
     renderChild(node: SchemaNode, region?: string, key?: any): React.ReactNode;
     itemRender(field: any, index: number, props: any): JSX.Element | undefined;
-    renderFeild(region: string, field: any, key: any, props: any): JSX.Element | undefined;
+    renderFeild(region: string, field: Schema, key: any, props: any): JSX.Element | undefined;
     renderBody(): React.ReactNode;
     rederTitle(): JSX.Element | undefined;
     renderSubTitle(): JSX.Element | undefined;

package/lib/renderers/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -9,13 +9,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var omit = require('lodash/omit');
+var merge = require('lodash/merge');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var QuickEdit = require('./QuickEdit.js');
 var PopOver = require('./PopOver.js');
 require('./Table/index.js');
 var Copyable = require('./Copyable.js');
-var omit = require('lodash/omit');
 var ReactDOM = require('react-dom');
 var TableCell = require('./Table/TableCell.js');
 
@@ -23,6 +24,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
+var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
 
 var CardRenderer = /** @class */ (function (_super) {
     tslib.__extends(CardRenderer, _super);
@@ -138,15 +140,17 @@ var CardRenderer = /** @class */ (function (_super) {
         return this.renderFeild("column/".concat(index), field, index, props);
     };
     CardRenderer.prototype.renderFeild = function (region, field, key, props) {
-        var render = props.render, cx = props.classnames, itemIndex = props.itemIndex;
+        var render = props.render, cx = props.classnames, itemIndex = props.itemIndex, useCardLabel = props.useCardLabel;
         var data = this.props.data;
-        if (!amisCore.isVisible(field, data)) {
+        if (!field || !amisCore.isVisible(field, data)) {
             return;
         }
         var $$id = field.$$id ? "".concat(field.$$id, "-field") : '';
         return (React__default["default"].createElement("div", { className: cx('Card-field'), key: key },
-            field && field.label ? (React__default["default"].createElement("label", { className: cx('Card-fieldLabel', field.labelClassName) }, field.label)) : null,
-            render(region, tslib.__assign(tslib.__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), {
+            useCardLabel && field.label ? (React__default["default"].createElement("label", { className: cx('Card-fieldLabel', field.labelClassName) }, field.label)) : null,
+            render(region, merge__default["default"](tslib.__assign(tslib.__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), useCardLabel
+                ? { label: false, field: tslib.__assign(tslib.__assign({}, field), { label: false }) }
+                : {}), {
                 className: cx('Card-fieldValue', field.className),
                 rowIndex: itemIndex,
                 colIndex: key,
@@ -315,7 +319,8 @@ var CardRenderer = /** @class */ (function (_super) {
         selectable: false,
         checkable: true,
         selected: false,
-        hideCheckToggler: false
+        hideCheckToggler: false,
+        useCardLabel: true
     };
     CardRenderer.propsList = [
         'avatarClassName',

package/lib/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Cards.d.ts

@@ -107,6 +107,7 @@ export interface GridProps extends RendererProps, Omit<CardsSchema, 'className'
     multiple?: boolean;
     valueField?: string;
     draggable?: boolean;
+    dragIcon?: SVGAElement;
     onSelect: (selectedItems: Array<object>, unSelectedItems: Array<object>) => void;
     onSave?: (items: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<number> | number, unModifiedItems?: Array<object>, rowOrigins?: Array<object> | object, resetOnFailed?: boolean) => void;
     onSaveOrder?: (moved: Array<object>, items: Array<object>) => void;

package/lib/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -314,6 +314,7 @@ var Cards = /** @class */ (function (_super) {
     };
     Cards.prototype.destroyDragging = function () {
         this.sortable && this.sortable.destroy();
+        this.sortable = undefined;
     };
     Cards.prototype.renderActions = function (region) {
         var _this = this;
@@ -410,7 +411,8 @@ var Cards = /** @class */ (function (_super) {
         return (React__default["default"].createElement(amisUi.Button, { key: "checkall", tooltip: "\u5207\u6362\u5168\u9009", onClick: this.handleCheckAll, size: "sm", level: store.allChecked ? 'info' : 'default' }, "\u5168\u9009"));
     };
     Cards.prototype.renderDragToggler = function () {
-        var _a = this.props, store = _a.store; _a.multiple; _a.selectable; var env = _a.env, __ = _a.translate;
+        var _this = this;
+        var _a = this.props, store = _a.store; _a.multiple; _a.selectable; var env = _a.env, __ = _a.translate, dragIcon = _a.dragIcon;
         if (!store.draggable || store.items.length < 2) {
             return null;
         }
@@ -418,8 +420,8 @@ var Cards = /** @class */ (function (_super) {
                 e.preventDefault();
                 store.toggleDragging();
                 store.dragging && store.clear();
-            } },
-            React__default["default"].createElement(amisUi.Icon, { icon: "exchange", className: "icon r90" })));
+                store.dragging ? _this.initDragging() : undefined;
+            } }, React__default["default"].isValidElement(dragIcon) ? (dragIcon) : (React__default["default"].createElement(amisUi.Icon, { icon: "exchange", className: "icon r90" }))));
     };
     Cards.prototype.renderToolbar = function (toolbar, index) {
         var type = toolbar.type || toolbar;
@@ -441,9 +443,11 @@ var Cards = /** @class */ (function (_super) {
             className: cx((card && card.className) || '', {
                 'is-checked': item.checked,
                 'is-modified': item.modified,
-                'is-moved': item.moved
+                'is-moved': item.moved,
+                'is-dragging': store.dragging
             }),
             item: item,
+            key: index,
             itemIndex: item.index,
             multiple: multiple,
             selectable: store.selectable,
@@ -468,7 +472,7 @@ var Cards = /** @class */ (function (_super) {
     };
     Cards.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, 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;
+        var _a = this.props, className = _a.className, 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;
         this.renderedToolbars = []; // 用来记录哪些 toolbar 已经渲染了，已经渲染了就不重复渲染了。
         var itemFinalClassName = columnsCount
             ? "Grid-col--sm".concat(Math.round(12 / columnsCount))
@@ -501,7 +505,8 @@ var Cards = /** @class */ (function (_super) {
             store.items.length ? (React__default["default"].createElement("div", { ref: this.itemsRef, className: cx('Cards-body Grid', itemsClassName, masonryClassName) }, store.items.map(function (item, index) {
                 return _this.renderCard(index, card, item, itemFinalClassName);
             }))) : (React__default["default"].createElement("div", { className: cx('Cards-placeholder') }, render('placeholder', __(placeholder)))),
-            footer));
+            footer,
+            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
     };
     Cards.propsList = [
         'header',

package/lib/renderers/Carousel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -34,6 +34,7 @@ function recoverFunctionType(config) {
         'min',
         'max',
         'labelFormatter',
+        'valueFormatter',
         'pageFormatter',
         'optionToContent',
         'contentToOption',