amis 2.0.2 → 2.2.0

package/lib/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -125,12 +125,12 @@ var Action = /** @class */ (function (_super) {
     }
     Action.prototype.handleAction = function (e) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onAction, disabled, countDown, env, onClick, result, _b, action, actionType, api, countDownEnd;
+            var _a, onAction, onActionSensor, disabled, countDown, env, onClick, result, _b, action, actionType, api, sensor, countDownEnd;
             var _this = this;
             return tslib.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _a = this.props, onAction = _a.onAction, disabled = _a.disabled, countDown = _a.countDown, env = _a.env;
+                        _a = this.props, onAction = _a.onAction, onActionSensor = _a.onActionSensor, disabled = _a.disabled, countDown = _a.countDown, env = _a.env;
                         // https://reactjs.org/docs/legacy-event-pooling.html
                         e.persist(); // 等 react 17之后去掉 event pooling 了，这个应该就没用了
                         onClick = this.props.onClick;
@@ -172,9 +172,14 @@ var Action = /** @class */ (function (_super) {
                             api.responseType = 'blob';
                             action.api = api;
                         }
-                        return [4 /*yield*/, onAction(e, action)];
+                        sensor = onAction(e, action);
+                        if (!(sensor === null || sensor === void 0 ? void 0 : sensor.then)) return [3 /*break*/, 4];
+                        onActionSensor === null || onActionSensor === void 0 ? void 0 : onActionSensor(sensor);
+                        return [4 /*yield*/, sensor];
                     case 3:
                         _c.sent();
+                        _c.label = 4;
+                    case 4:
                         if (countDown) {
                             countDownEnd = Date.now() + countDown * 1000;
                             this.setState({
@@ -255,7 +260,7 @@ var Action = /** @class */ (function (_super) {
                 _a[activeClassName || 'is-active'] = isActive,
                 _a)), size: size, level: activeLevel && isActive
                 ? activeLevel
-                : level || (primary ? 'primary' : undefined), loadingClassName: loadingClassName, loading: loading, onClick: this.handleAction, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, type: type && ~allowedType.indexOf(type) ? type : 'button', disabled: disabled, componentClass: isMenuItem ? 'a' : componentClass, overrideClassName: isMenuItem, tooltip: tooltip, disabledTip: disabledTip, tooltipPlacement: tooltipPlacement, tooltipContainer: tooltipContainer, tooltipTrigger: tooltipTrigger, tooltipRootClose: tooltipRootClose, block: block, iconOnly: !!(icon && !label && level !== 'link') },
+                : level || (primary ? 'primary' : undefined), loadingClassName: loadingClassName, loading: loading, onClick: this.handleAction, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, type: type && ~allowedType.indexOf(type) ? type : 'button', disabled: disabled, componentClass: isMenuItem ? 'a' : componentClass, overrideClassName: isMenuItem, tooltip: Remark.filterContents(tooltip, data), disabledTip: Remark.filterContents(disabledTip, data), tooltipPlacement: tooltipPlacement, tooltipContainer: tooltipContainer, tooltipTrigger: tooltipTrigger, tooltipRootClose: tooltipRootClose, block: block, iconOnly: !!(icon && !label && level !== 'link') },
             !loading ? iconElement : '',
             label ? React__default["default"].createElement("span", null, amisCore.filter(String(label), data)) : null,
             rightIconElement));
@@ -317,16 +322,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 +344,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.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/App.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Audio.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Avatar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/BarCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Breadcrumb.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/ButtonGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/CRUD.d.ts

@@ -201,7 +201,7 @@ export interface CRUDCommonSchema extends BaseSchema {
     /**
      * 内容区域占满屏幕剩余空间
      */
-    autoFillHeight?: boolean;
+    autoFillHeight?: TableSchema['autoFillHeight'];
 }
 export declare type CRUDCardsSchema = CRUDCommonSchema & {
     mode: 'cards';
@@ -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;
@@ -263,7 +263,10 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     search(values?: any, silent?: boolean, clearSelection?: boolean, forceReload?: boolean): void;
     silentSearch(values?: object, clearSelection?: boolean, forceReload?: boolean): void;
     handleChangePage(page: number, perPage?: number): void;
-    handleSave(rows: Array<object> | object, diff: Array<object> | object, indexes: Array<string>, unModifiedItems?: Array<any>, rowsOrigin?: Array<object> | object, resetOnFailed?: boolean): void;
+    handleSave(rows: Array<object> | object, diff: Array<object> | object, indexes: Array<string>, unModifiedItems?: Array<any>, rowsOrigin?: Array<object> | object, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     handleSaveOrder(moved: Array<object>, rows: Array<object>): void;
     handleSelect(items: Array<any>, unSelectedItems: Array<any>): void;
     handleChildPopOverOpen(popOver: any): void;
@@ -282,7 +285,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.2
+ * amis v2.2.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,18 @@ 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) {
@@ -464,6 +471,15 @@ var CRUD = /** @class */ (function (_super) {
                 columns: (_a = store.columns) !== null && _a !== void 0 ? _a : columns
             })
                 .then(function (value) {
+                var _a;
+                var page = store.page, lastPage = store.lastPage;
+                // 空列表 且 页数已经非法超出，则跳转到最后的合法页数
+                if (!store.data.items.length &&
+                    !interval &&
+                    page > 1 &&
+                    lastPage < page) {
+                    _this.search(tslib.__assign(tslib.__assign({}, store.query), (_a = {}, _a[pageField || 'page'] = lastPage, _a)), false, undefined);
+                }
                 interval &&
                     _this.mounted &&
                     (!stopAutoRefreshWhen ||
@@ -499,7 +515,7 @@ var CRUD = /** @class */ (function (_super) {
             scrolledY && window.scroll(0, scrolledY - offsetTop);
         }
     };
-    CRUD.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, resetOnFailed) {
+    CRUD.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, options) {
         var _this = this;
         var _a = this.props, store = _a.store, quickSaveApi = _a.quickSaveApi, quickSaveItemApi = _a.quickSaveItemApi, primaryField = _a.primaryField, env = _a.env, messages = _a.messages, reload = _a.reload;
         if (Array.isArray(rows)) {
@@ -527,8 +543,11 @@ var CRUD = /** @class */ (function (_super) {
                 errorMessage: messages && messages.saveSuccess
             })
                 .then(function () {
-                reload && _this.reloadTarget(reload, data_1);
-                _this.search(undefined, undefined, true, true);
+                var _a;
+                var finalReload = (_a = options === null || options === void 0 ? void 0 : options.reload) !== null && _a !== void 0 ? _a : reload;
+                finalReload
+                    ? _this.reloadTarget(finalReload, data_1)
+                    : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () { });
         }
@@ -546,11 +565,14 @@ var CRUD = /** @class */ (function (_super) {
             store
                 .saveRemote(quickSaveItemApi, sendData)
                 .then(function () {
-                reload && _this.reloadTarget(reload, data_2);
-                _this.search(undefined, undefined, true, true);
+                var _a;
+                var finalReload = (_a = options === null || options === void 0 ? void 0 : options.reload) !== null && _a !== void 0 ? _a : reload;
+                finalReload
+                    ? _this.reloadTarget(finalReload, data_2)
+                    : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () {
-                resetOnFailed && _this.control.reset();
+                (options === null || options === void 0 ? void 0 : options.resetOnFailed) && _this.control.reset();
             });
         }
     };
@@ -800,7 +822,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,
@@ -982,7 +1007,9 @@ var CRUD = /** @class */ (function (_super) {
                     var toolbar = _a.toolbar, child = _a.dom;
                     var type = toolbar.type || toolbar;
                     var align = toolbar.align || (type === 'pagination' ? 'right' : 'left');
-                    return (React__default["default"].createElement("div", { key: index, className: cx_1('Crud-toolbar-item', align ? "Crud-toolbar-item--".concat(align) : '', toolbar.className) }, child));
+                    return (React__default["default"].createElement("div", { key: index, className: cx_1('Crud-toolbar-item', align ? "Crud-toolbar-item--".concat(align) : ''
+                        // toolbar.className
+                        ) }, child));
                 })));
             }
             return null;

package/lib/renderers/CRUD2.d.ts

@@ -6,7 +6,7 @@ import { IScopedContext } from 'amis-core';
 import { BaseSchema, SchemaApi, SchemaExpression, SchemaName, SchemaObject, SchemaTokenizeableString } from '../Schema';
 import { CardsSchema } from './Cards';
 import { ListSchema } from './List';
-import { TableSchema } from './Table';
+import { TableSchema2 } from './Table2';
 import { SchemaCollection } from '../Schema';
 export declare type CRUDRendererEvent = 'search';
 export interface CRUD2CommonSchema extends BaseSchema {
@@ -17,7 +17,7 @@ export interface CRUD2CommonSchema extends BaseSchema {
     /**
      * 指定内容区的展示模式。
      */
-    mode?: 'table' | 'grid' | 'cards' | /* grid 的别名*/ 'list' | 'table-v2';
+    mode?: 'table' | 'grid' | 'cards' | /* grid 的别名*/ 'list' | 'table2';
     /**
      * 初始化数据 API
      */
@@ -123,8 +123,8 @@ export declare type CRUD2ListSchema = CRUD2CommonSchema & {
     mode: 'list';
 } & Omit<ListSchema, 'type'>;
 export declare type CRUD2TableSchema = CRUD2CommonSchema & {
-    mode?: 'table';
-} & Omit<TableSchema, 'type'>;
+    mode?: 'table2';
+} & Omit<TableSchema2, 'type'>;
 export declare type CRUD2Schema = CRUD2CardsSchema | CRUD2ListSchema | CRUD2TableSchema;
 export interface CRUD2Props extends RendererProps, Omit<CRUD2CommonSchema, 'type' | 'className'> {
     store: ICRUDStore;
@@ -184,7 +184,10 @@ export default class CRUD2 extends React.Component<CRUD2Props, any> {
     /** 加载更多数据，默认模式取props中的配置，只有事件动作需要直接触发 */
     loadMore?: boolean): void;
     handleChangePage(page: number, perPage?: number): void;
-    handleSave(rows: Array<object> | object, diff: Array<object> | object, indexes: Array<string>, unModifiedItems?: Array<any>, rowsOrigin?: Array<object> | object, resetOnFailed?: boolean): void;
+    handleSave(rows: Array<object> | object, diff: Array<object> | object, indexes: Array<string>, unModifiedItems?: Array<any>, rowsOrigin?: Array<object> | object, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     handleSaveOrder(moved: Array<object>, rows: Array<object>): void;
     handleSelect(items: Array<any>, unSelectedItems: Array<any>): void;
     /**

package/lib/renderers/CRUD2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -47,7 +47,7 @@ var CRUD2 = /** @class */ (function (_super) {
         // 自定义列需要用store里的数据同步显示列
         // 所以需要先初始化一下
         var mode = props.mode, columns = props.columns;
-        if (mode === 'table-v2' && columns) {
+        if (mode === 'table2' && columns) {
             store.updateColumns(columns);
         }
         return _this;
@@ -70,6 +70,9 @@ var CRUD2 = /** @class */ (function (_super) {
     CRUD2.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
         var store = prevProps.store;
+        if (prevProps.columns !== props.columns) {
+            store.updateColumns(props.columns);
+        }
         // picker外部引起的值变化处理
         var val;
         if (this.props.pickerMode &&
@@ -211,7 +214,8 @@ var CRUD2 = /** @class */ (function (_super) {
                 perPageField: perPageField,
                 loadDataMode: loadDataMode,
                 syncResponse2Query: syncResponse2Query,
-                columns: (_a = store.columns) !== null && _a !== void 0 ? _a : columns
+                columns: (_a = store.columns) !== null && _a !== void 0 ? _a : columns,
+                isTable2: true
             })
                 .then(function (value) {
                 interval &&
@@ -246,7 +250,7 @@ var CRUD2 = /** @class */ (function (_super) {
             scrolledY && window.scroll(0, scrolledY - offsetTop);
         }
     };
-    CRUD2.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, resetOnFailed) {
+    CRUD2.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, options) {
         var _this = this;
         var _a = this.props, store = _a.store, quickSaveApi = _a.quickSaveApi, quickSaveItemApi = _a.quickSaveItemApi, primaryField = _a.primaryField, env = _a.env, messages = _a.messages, reload = _a.reload;
         if (Array.isArray(rows)) {
@@ -297,7 +301,7 @@ var CRUD2 = /** @class */ (function (_super) {
                 _this.getData(undefined, undefined, true, true);
             })
                 .catch(function () {
-                resetOnFailed && _this.control.reset();
+                (options === null || options === void 0 ? void 0 : options.resetOnFailed) && _this.control.reset();
             });
         }
     };
@@ -577,7 +581,7 @@ var CRUD2 = /** @class */ (function (_super) {
             React__default["default"].createElement("a", { onClick: this.clearSelection, className: cx('Crud-selectionClear') }, __('clear'))));
     };
     CRUD2.prototype.render = function () {
-        var _a = this.props, columns = _a.columns, className = _a.className, bodyClassName = _a.bodyClassName, filter = _a.filter, render = _a.render, store = _a.store, _b = _a.mode, mode = _b === void 0 ? 'table-v2' : _b; _a.syncLocation; _a.children; _a.bulkActions; var pickerMode = _a.pickerMode, selectable = _a.selectable, multiple = _a.multiple, valueField = _a.valueField, primaryField = _a.primaryField; _a.value; _a.hideQuickSaveBtn; var itemActions = _a.itemActions, cx = _a.classnames, keepItemSelectionOnPageChange = _a.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _a.maxKeepItemSelectionLength; _a.onAction; var popOverContainer = _a.popOverContainer; _a.translate; _a.onQuery; var autoGenerateFilter = _a.autoGenerateFilter; _a.onSelect; var autoFillHeight = _a.autoFillHeight, showSelection = _a.showSelection, headerToolbar = _a.headerToolbar, footerToolbar = _a.footerToolbar, rest = tslib.__rest(_a, ["columns", "className", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "selectable", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "showSelection", "headerToolbar", "footerToolbar"]);
+        var _a = this.props, columns = _a.columns, className = _a.className, bodyClassName = _a.bodyClassName, filter = _a.filter, render = _a.render, store = _a.store, _b = _a.mode, mode = _b === void 0 ? 'table2' : _b; _a.syncLocation; _a.children; _a.bulkActions; var pickerMode = _a.pickerMode, selectable = _a.selectable, multiple = _a.multiple, valueField = _a.valueField, primaryField = _a.primaryField; _a.value; _a.hideQuickSaveBtn; var itemActions = _a.itemActions, cx = _a.classnames, keepItemSelectionOnPageChange = _a.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _a.maxKeepItemSelectionLength; _a.onAction; var popOverContainer = _a.popOverContainer; _a.translate; _a.onQuery; var autoGenerateFilter = _a.autoGenerateFilter; _a.onSelect; var autoFillHeight = _a.autoFillHeight, showSelection = _a.showSelection, headerToolbar = _a.headerToolbar, footerToolbar = _a.footerToolbar, rest = tslib.__rest(_a, ["columns", "className", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "selectable", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "showSelection", "headerToolbar", "footerToolbar"]);
         return (React__default["default"].createElement("div", { className: cx('Crud2', className, {
                 'is-loading': store.loading
             }) },

package/lib/renderers/Calendar.d.ts

@@ -23,6 +23,16 @@ export interface CalendarSchema extends BaseSchema {
      * 日程点击展示
      */
     scheduleAction?: SchemaObject;
+    /**
+     * 是否开启放大模式
+     */
+    largeMode?: boolean;
+    /**
+     * 今日激活时的自定义样式
+     */
+    todayActiveStyle?: {
+        [propName: string]: any;
+    };
 }
 export declare class CalendarRenderer extends DateControlRenderer {
     static defaultProps: {

package/lib/renderers/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Card.d.ts

@@ -208,7 +208,10 @@ export declare class CardRenderer extends React.Component<CardProps> {
     handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object): void;
     handleCheck(e: React.MouseEvent<any>): void;
     getPopOverContainer(): Element | Text | null;
-    handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, resetOnFailed?: boolean): void;
+    handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     renderToolbar(): JSX.Element | null;
     renderActions(): JSX.Element[] | undefined;
     renderChild(node: SchemaNode, region?: string, key?: any): React.ReactNode;

package/lib/renderers/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -10,7 +10,6 @@ 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');
@@ -24,7 +23,6 @@ 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);
@@ -68,10 +66,10 @@ var CardRenderer = /** @class */ (function (_super) {
     CardRenderer.prototype.getPopOverContainer = function () {
         return ReactDOM.findDOMNode(this);
     };
-    CardRenderer.prototype.handleQuickChange = function (values, saveImmediately, savePristine, resetOnFailed) {
+    CardRenderer.prototype.handleQuickChange = function (values, saveImmediately, savePristine, options) {
         var _a = this.props, onQuickChange = _a.onQuickChange, item = _a.item;
         onQuickChange &&
-            onQuickChange(item, values, saveImmediately, savePristine, resetOnFailed);
+            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;
@@ -140,7 +138,8 @@ 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, useCardLabel = props.useCardLabel;
+        var render = props.render, cx = props.classnames, itemIndex = props.itemIndex;
+        var useCardLabel = (props === null || props === void 0 ? void 0 : props.useCardLabel) !== false;
         var data = this.props.data;
         if (!field || !amisCore.isVisible(field, data)) {
             return;
@@ -148,9 +147,8 @@ var CardRenderer = /** @class */ (function (_super) {
         var $$id = field.$$id ? "".concat(field.$$id, "-field") : '';
         return (React__default["default"].createElement("div", { className: cx('Card-field'), key: key },
             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 }) }
-                : {}), {
+            render(region, tslib.__assign(tslib.__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), {
+                useCardLabel: useCardLabel,
                 className: cx('Card-fieldValue', field.className),
                 rowIndex: itemIndex,
                 colIndex: key,
@@ -349,8 +347,10 @@ 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, rest = tslib.__rest(_a, ["type", "className", "render", "style", "wrapperComponent", "labelClassName", "value", "data", "children", "width", "innerClassName", "label", "tabIndex", "onKeyUp", "field"]);
-        var schema = tslib.__assign(tslib.__assign({}, field), { className: innerClassName, type: (field && field.type) || 'plain' });
+        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 = tslib.__rest(_a, ["type", "className", "render", "style", "wrapperComponent", "labelClassName", "value", "data", "children", "width", "innerClassName", "label", "tabIndex", "onKeyUp", "field", "useCardLabel"]);
+        var schema = tslib.__assign(tslib.__assign({}, field), { 
+            /** 针对带有label的表单项组件，默认不渲染组件自带的label，否则会出现重复的label */
+            renderLabel: !useCardLabel, className: innerClassName, type: (field && field.type) || 'plain' });
         var body = children
             ? children
             : render('field', schema, tslib.__assign(tslib.__assign({}, omit__default["default"](rest, Object.keys(schema))), { value: value, data: data }));

package/lib/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Cards.d.ts

@@ -107,8 +107,12 @@ 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;
+    onSave?: (items: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<number> | number, unModifiedItems?: Array<object>, rowOrigins?: Array<object> | object, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }) => void;
     onSaveOrder?: (moved: Array<object>, items: Array<object>) => void;
     onQuery: (values: object) => void;
 }
@@ -136,7 +140,10 @@ export default class Cards extends React.Component<GridProps, object> {
     handleSelectAll(): void;
     handleClearAll(): void;
     syncSelected(): void;
-    handleQuickChange(item: IItem, values: object, saveImmediately?: boolean | any, saveSilent?: boolean, resetOnFailed?: boolean): void;
+    handleQuickChange(item: IItem, values: object, saveImmediately?: boolean | any, savePristine?: boolean, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     handleSave(): void;
     handleSaveOrder(): void;
     reset(): void;