amis 2.7.3-beta.0 → 2.9.0

package/lib/renderers/Action.d.ts

@@ -287,7 +287,7 @@ export interface ActionProps extends Omit<ButtonSchema, 'className' | 'iconClass
     onActionSensor?: (promise?: Promise<any>) => void;
     isCurrentUrl?: (link: string) => boolean;
     onClick?: ((e: React.MouseEvent<any>, props: any) => void) | string | Function | null;
-    componentClass: React.ReactType;
+    componentClass: React.ElementType;
     tooltipContainer?: any;
     data?: any;
     isMenuItem?: boolean;
@@ -301,7 +301,7 @@ interface ActionState {
 export declare class Action extends React.Component<ActionProps, ActionState> {
     static defaultProps: {
         type: "button";
-        componentClass: React.ReactType<any>;
+        componentClass: React.ElementType<any>;
         tooltipPlacement: "bottom";
         activeClassName: string;
         countDownTpl: string;
@@ -322,16 +322,14 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
+        /**
+         * 倒计时文字自定义
+         */
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        /**
-         * 配置 ajax 发送地址
-         */
-        readonly props: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -343,9 +341,7 @@ declare const _default: {
         getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
         componentDidUpdate?(prevProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void; /**
-         * 指定为打开弹窗，抽出式弹窗
-         */
+        UNSAFE_componentWillMount?(): void;
         componentWillReceiveProps?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
         UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
         componentWillUpdate?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;

package/lib/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -104,13 +104,18 @@ var allowedType = ['button', 'submit', 'reset'];
 var Action = /** @class */ (function (_super) {
     tslib.__extends(Action, _super);
     function Action(props) {
-        var _this = _super.call(this, props) || this;
+        var _this = this;
+        var _a, _b;
+        _this = _super.call(this, props) || this;
         _this.state = {
             inCountDown: false,
             countDownEnd: 0,
             timeLeft: 0
         };
-        _this.localStorageKey = 'amis-countdownend-' + (_this.props.name || '');
+        _this.localStorageKey =
+            'amis-countdownend-' +
+                (_this.props.name || '') +
+                (((_b = (_a = _this.props) === null || _a === void 0 ? void 0 : _a.$schema) === null || _b === void 0 ? void 0 : _b.id) || amisCore.uuid());
         var countDownEnd = parseInt(localStorage.getItem(_this.localStorageKey) || '0');
         if (countDownEnd && _this.props.countDown) {
             if (Date.now() < countDownEnd) {

package/lib/renderers/Alert.d.ts

@@ -22,7 +22,7 @@ export interface AlertSchema extends BaseSchema {
     /**
      * 提示类型
      */
-    level?: 'info' | 'warning' | 'success' | 'error' | 'danger';
+    level?: 'info' | 'warning' | 'success' | 'danger';
     /**
      * 是否显示关闭按钮
      */

package/lib/renderers/Alert.js

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

package/lib/renderers/AnchorNav.js

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

package/lib/renderers/App.js

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

package/lib/renderers/Audio.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -186,8 +186,8 @@ var Audio = /** @class */ (function (_super) {
     Audio.prototype.formatTime = function (seconds) {
         var date = new Date(seconds * 1000);
         var hh = date.getUTCHours();
-        var mm = date.getUTCMinutes();
-        var ss = this.pad(date.getUTCSeconds());
+        var mm = isNaN(date.getUTCMinutes()) ? 0 : date.getUTCMinutes();
+        var ss = isNaN(date.getUTCSeconds()) ? '00' : this.pad(date.getUTCSeconds());
         if (hh) {
             return "".concat(hh, ":").concat(this.pad(mm), ":").concat(ss);
         }

package/lib/renderers/Avatar.js

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

package/lib/renderers/BarCode.js

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

package/lib/renderers/Breadcrumb.js

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

package/lib/renderers/ButtonGroup.js

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

package/lib/renderers/CRUD.d.ts

@@ -293,9 +293,9 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     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;
-    renderHeaderToolbar(childProps: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): {} | null;
-    renderFooterToolbar(childProps: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): {} | null;
+    renderToolbar(toolbar?: SchemaNode, index?: number, childProps?: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): string | number | boolean | React.ReactFragment | JSX.Element | null;
+    renderHeaderToolbar(childProps: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): string | number | boolean | React.ReactFragment | JSX.Element | null;
+    renderFooterToolbar(childProps: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): string | number | boolean | React.ReactFragment | JSX.Element | null;
     renderSelection(): React.ReactNode;
     render(): JSX.Element;
 }

package/lib/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -208,7 +208,7 @@ var CRUD = /** @class */ (function (_super) {
                             redirect = action.redirect && amisCore.filter(action.redirect, data);
                             redirect && !action.blank && env.jumpTo(redirect, action);
                             action.reload
-                                ? this.reloadTarget(action.reload, data)
+                                ? this.reloadTarget(amisCore.filter(action.reload, data), data)
                                 : redirect
                                     ? null
                                     : this.search(undefined, undefined, true, true);
@@ -286,7 +286,7 @@ var CRUD = /** @class */ (function (_super) {
                                     _b.label = 2;
                                 case 2:
                                     action.reload
-                                        ? this.reloadTarget(action.reload, data)
+                                        ? this.reloadTarget(amisCore.filter(action.reload, data), data)
                                         : this.search((_a = {}, _a[pageField || 'page'] = 1, _a), undefined, true, true);
                                     action.close && this.closeTarget(action.close);
                                     redirect = action.redirect && amisCore.filter(action.redirect, data);
@@ -426,7 +426,7 @@ var CRUD = /** @class */ (function (_super) {
         }
         var reload = (_c = action.reload) !== null && _c !== void 0 ? _c : dialogAction.reload;
         if (reload) {
-            this.reloadTarget(reload, ctx);
+            this.reloadTarget(amisCore.filter(reload, ctx), ctx);
         }
         var redirect = (_d = action.redirect) !== null && _d !== void 0 ? _d : dialogAction.redirect;
         redirect = redirect && amisCore.filter(redirect, ctx);
@@ -569,7 +569,7 @@ var CRUD = /** @class */ (function (_super) {
                 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.reloadTarget(amisCore.filter(finalReload, data_1), data_1)
                     : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -591,7 +591,7 @@ var CRUD = /** @class */ (function (_super) {
                 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.reloadTarget(amisCore.filter(finalReload, data_2), data_2)
                     : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () {
@@ -678,7 +678,7 @@ var CRUD = /** @class */ (function (_super) {
             store
                 .saveRemote(saveOrderApi, model)
                 .then(function () {
-                reload && _this.reloadTarget(reload, model);
+                reload && _this.reloadTarget(amisCore.filter(reload, model), model);
                 _this.search(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -954,7 +954,7 @@ var CRUD = /** @class */ (function (_super) {
         if (!store.filterTogggable) {
             return null;
         }
-        return (React__default["default"].createElement("button", { onClick: function () { return store.setFilterVisible(!store.filterVisible); }, className: cx('Button Button--sm Button--default', {
+        return (React__default["default"].createElement("button", { onClick: function () { return store.setFilterVisible(!store.filterVisible); }, className: cx('Button Button--size-default Button--default', {
                 'is-active': store.filterVisible
             }) },
             React__default["default"].createElement(amisUi.Icon, { icon: "filter", className: "icon m-r-xs" }),
@@ -1117,7 +1117,7 @@ var CRUD = /** @class */ (function (_super) {
     };
     CRUD.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, style = _b.style, bodyClassName = _b.bodyClassName, filter = _b.filter, render = _b.render, store = _b.store, mode = _b.mode; _b.syncLocation; _b.children; var bulkActions = _b.bulkActions, pickerMode = _b.pickerMode, multiple = _b.multiple, valueField = _b.valueField, primaryField = _b.primaryField; _b.value; var hideQuickSaveBtn = _b.hideQuickSaveBtn, itemActions = _b.itemActions, cx = _b.classnames, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _b.maxKeepItemSelectionLength; _b.onAction; var popOverContainer = _b.popOverContainer, __ = _b.translate; _b.onQuery; var autoGenerateFilter = _b.autoGenerateFilter; _b.onSelect; var autoFillHeight = _b.autoFillHeight; _b.onEvent; var rest = tslib.__rest(_b, ["className", "style", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "onEvent"]);
+        var _b = this.props, className = _b.className, style = _b.style, bodyClassName = _b.bodyClassName, filter = _b.filter, render = _b.render, store = _b.store, mode = _b.mode; _b.syncLocation; _b.children; var bulkActions = _b.bulkActions, pickerMode = _b.pickerMode, multiple = _b.multiple, valueField = _b.valueField, primaryField = _b.primaryField; _b.value; var hideQuickSaveBtn = _b.hideQuickSaveBtn, itemActions = _b.itemActions, cx = _b.classnames, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _b.maxKeepItemSelectionLength; _b.onAction; var popOverContainer = _b.popOverContainer, __ = _b.translate; _b.onQuery; var autoGenerateFilter = _b.autoGenerateFilter; _b.onSelect; var autoFillHeight = _b.autoFillHeight; _b.onEvent; _b.onSave; _b.onSaveOrder; _b.onPopOverOpened; _b.onPopOverClosed; _b.onSearchableFromReset; _b.onSearchableFromSubmit; _b.onSearchableFromInit; _b.headerToolbarRender; _b.footerToolbarRender; var rest = tslib.__rest(_b, ["className", "style", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "onEvent", "onSave", "onSaveOrder", "onPopOverOpened", "onPopOverClosed", "onSearchableFromReset", "onSearchableFromSubmit", "onSearchableFromInit", "headerToolbarRender", "footerToolbarRender"]);
         return (React__default["default"].createElement("div", { className: cx('Crud', className, {
                 'is-loading': store.loading
             }), style: style },
@@ -1236,6 +1236,7 @@ var CRUD = /** @class */ (function (_super) {
         'onChange',
         'onInit',
         'onSaved',
+        'onSave',
         'onQuery',
         'formStore',
         'autoFillHeight'

package/lib/renderers/CRUD2.d.ts

@@ -166,6 +166,7 @@ export default class CRUD2 extends React.Component<CRUD2Props, any> {
         query?: object;
         resetQuery?: boolean;
         replaceQuery?: boolean;
+        loadMore?: boolean;
     }): void;
     handleStopAutoRefresh(): void;
     handleStartAutoRefresh(): void;
@@ -192,9 +193,9 @@ export default class CRUD2 extends React.Component<CRUD2Props, any> {
     handleSaveOrder(moved: Array<object>, rows: Array<object>): void;
     handleSelect(items: Array<any>, unSelectedItems: Array<any>): void;
     /**
-     * 表格列上的筛选触发
+     * 更新Query筛选触发
      */
-    handleTableQuery(values: object, forceReload?: boolean): void;
+    handleQuerySearch(values: object, forceReload?: boolean): void;
     reload(subpath?: string, query?: any): void;
     receive(values: object): void;
     doAction(action: Action, data: object, throwErrors?: boolean): any;

package/lib/renderers/CRUD2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -123,7 +123,7 @@ var CRUD2 = /** @class */ (function (_super) {
         this.control = control;
     };
     CRUD2.prototype.initQuery = function (values) {
-        var _a = this.props, store = _a.store, orderBy = _a.orderBy, orderDir = _a.orderDir;
+        var _a = this.props, store = _a.store, orderBy = _a.orderBy, orderDir = _a.orderDir, loadType = _a.loadType;
         var params = {};
         if (orderBy) {
             params['orderBy'] = orderBy;
@@ -131,7 +131,8 @@ var CRUD2 = /** @class */ (function (_super) {
         }
         this.handleSearch({
             query: tslib.__assign(tslib.__assign(tslib.__assign({}, params), values), store.query),
-            replaceQuery: this.props.initFetch !== false
+            replaceQuery: this.props.initFetch !== false,
+            loadMore: loadType === 'more'
         });
         // 保留一次用于重置查询条件
         store.setPristineQuery();
@@ -140,6 +141,8 @@ var CRUD2 = /** @class */ (function (_super) {
      * 加载更多动作处理器
      */
     CRUD2.prototype.handleLoadMore = function () {
+        var _a = this.props, store = _a.store, perPage = _a.perPage;
+        store.changePage(store.page + 1, perPage);
         this.getData(undefined, undefined, undefined, true);
     };
     /**
@@ -147,7 +150,7 @@ var CRUD2 = /** @class */ (function (_super) {
      */
     CRUD2.prototype.handleSearch = function (data) {
         var _a = this.props, store = _a.store, syncLocation = _a.syncLocation, env = _a.env, pageField = _a.pageField, perPageField = _a.perPageField;
-        var _b = data || {}, query = _b.query, resetQuery = _b.resetQuery, replaceQuery = _b.replaceQuery;
+        var _b = data || {}, query = _b.query, resetQuery = _b.resetQuery, replaceQuery = _b.replaceQuery, loadMore = _b.loadMore;
         query =
             syncLocation && query
                 ? amisCore.qsparse(amisCore.qsstringify(query, undefined, true))
@@ -155,8 +158,9 @@ var CRUD2 = /** @class */ (function (_super) {
         store.updateQuery(resetQuery ? this.props.store.pristineQuery : query, syncLocation && env && env.updateLocation
             ? function (location) { return env.updateLocation(location, true); }
             : undefined, pageField, perPageField, replaceQuery);
+        store.changePage(1);
         this.lastQuery = store.query;
-        this.getData(undefined, undefined, undefined);
+        this.getData(undefined, undefined, undefined, loadMore !== null && loadMore !== void 0 ? loadMore : false);
     };
     CRUD2.prototype.handleStopAutoRefresh = function () {
         this.timer && clearTimeout(this.timer);
@@ -190,7 +194,7 @@ var CRUD2 = /** @class */ (function (_super) {
         var _this = this;
         var _a;
         if (forceReload === void 0) { forceReload = false; }
-        var _b = this.props, store = _b.store, api = _b.api, messages = _b.messages, pageField = _b.pageField, perPageField = _b.perPageField, interval = _b.interval, stopAutoRefreshWhen = _b.stopAutoRefreshWhen, silentPolling = _b.silentPolling; _b.syncLocation; var syncResponse2Query = _b.syncResponse2Query, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, stopAutoRefreshWhenModalIsOpen = _b.stopAutoRefreshWhenModalIsOpen, pickerMode = _b.pickerMode; _b.env; var loadType = _b.loadType, loadDataOnce = _b.loadDataOnce, loadDataOnceFetchOnFilter = _b.loadDataOnceFetchOnFilter, source = _b.source, columns = _b.columns;
+        var _b = this.props, store = _b.store, api = _b.api, messages = _b.messages, pageField = _b.pageField, perPageField = _b.perPageField, interval = _b.interval, stopAutoRefreshWhen = _b.stopAutoRefreshWhen, silentPolling = _b.silentPolling; _b.syncLocation; var syncResponse2Query = _b.syncResponse2Query, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, stopAutoRefreshWhenModalIsOpen = _b.stopAutoRefreshWhenModalIsOpen, pickerMode = _b.pickerMode; _b.env; var loadType = _b.loadType, loadDataOnce = _b.loadDataOnce, loadDataOnceFetchOnFilter = _b.loadDataOnceFetchOnFilter, source = _b.source, columns = _b.columns, perPage = _b.perPage;
         // reload 需要清空用户选择
         if (!loadMore &&
             keepItemSelectionOnPageChange &&
@@ -203,6 +207,11 @@ var CRUD2 = /** @class */ (function (_super) {
         this.lastQuery = store.query;
         var loadDataMode = loadMore !== null && loadMore !== void 0 ? loadMore : loadType === 'more';
         var data = amisCore.createObject(store.data, store.query);
+        // handleLoadMore 是在事件触发后才执行，首次加载并不走到 handleLoadMore
+        // 所以加载更多模式下，首次加载也需要使用设置的 perPage，避免前后 perPage 不一致导致的问题
+        if (loadDataMode && perPage) {
+            store.changePerPage(perPage);
+        }
         amisCore.isEffectiveApi(api, data)
             ? store
                 .fetchInitData(api, data, {
@@ -282,7 +291,7 @@ var CRUD2 = /** @class */ (function (_super) {
                 errorMessage: messages && messages.saveSuccess
             })
                 .then(function () {
-                reload && _this.reloadTarget(reload, data_1);
+                reload && _this.reloadTarget(amisCore.filter(reload, data_1), data_1);
                 _this.getData(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -301,7 +310,7 @@ var CRUD2 = /** @class */ (function (_super) {
             store
                 .saveRemote(quickSaveItemApi, sendData)
                 .then(function () {
-                reload && _this.reloadTarget(reload, data_2);
+                reload && _this.reloadTarget(amisCore.filter(reload, data_2), data_2);
                 _this.getData(undefined, undefined, true, true);
             })
                 .catch(function () {
@@ -388,7 +397,7 @@ var CRUD2 = /** @class */ (function (_super) {
             store
                 .saveRemote(saveOrderApi, model)
                 .then(function () {
-                reload && _this.reloadTarget(reload, model);
+                reload && _this.reloadTarget(amisCore.filter(reload, model), model);
                 _this.getData(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -464,9 +473,9 @@ var CRUD2 = /** @class */ (function (_super) {
         onSelect && onSelect(newItems);
     };
     /**
-     * 表格列上的筛选触发
+     * 更新Query筛选触发
      */
-    CRUD2.prototype.handleTableQuery = function (values, forceReload) {
+    CRUD2.prototype.handleQuerySearch = function (values, forceReload) {
         var _a;
         if (forceReload === void 0) { forceReload = false; }
         var _b = this.props, store = _b.store, syncLocation = _b.syncLocation, env = _b.env, pageField = _b.pageField, perPageField = _b.perPageField;
@@ -484,11 +493,17 @@ var CRUD2 = /** @class */ (function (_super) {
         }
     };
     CRUD2.prototype.receive = function (values) {
-        this.handleTableQuery(values, true);
+        this.handleQuerySearch(values, true);
     };
     CRUD2.prototype.doAction = function (action, data, throwErrors) {
         if (action.actionType &&
-            ['stopAutoRefresh', 'reload', 'search', 'startAutoRefresh'].includes(action.actionType)) {
+            [
+                'stopAutoRefresh',
+                'reload',
+                'search',
+                'startAutoRefresh',
+                'loadMore'
+            ].includes(action.actionType)) {
             // @ts-ignore
             return this["handle".concat(upperFirst__default["default"](action.actionType))](data);
         }
@@ -537,14 +552,17 @@ var CRUD2 = /** @class */ (function (_super) {
             onPageChange: this.handleChangePage,
             cols: store.columns,
             toggleAllColumns: this.toggleAllColumns,
-            toggleToggle: this.toggleToggle
+            toggleToggle: this.toggleToggle,
+            // 支持 onQuery，主要是给 searchBox 组件使用
+            onQuery: this.handleQuerySearch
             // onAction: onAction
         };
-        return render(region, schema, tslib.__assign(tslib.__assign(tslib.__assign({}, props), { 
+        return render(region, schema, tslib.__assign(tslib.__assign({ 
             // 包两层，主要是为了处理以下 case
             // 里面放了个 form，form 提交过来的时候不希望把 items 这些发送过来。
             // 因为会把数据呈现在地址栏上。
-            data: amisCore.createObject(amisCore.createObject(store.filterData, store.getData(this.props.data)), {}), render: this.renderChild }), childProps));
+            /** data 可以被覆盖，因为 filter 中不需要额外的 data */
+            data: amisCore.createObject(amisCore.createObject(store.filterData, store.getData(this.props.data)), {}) }, props), childProps));
     };
     CRUD2.prototype.renderToolbar = function (region, toolbar) {
         var _this = this;
@@ -565,8 +583,15 @@ var CRUD2 = /** @class */ (function (_super) {
         }
         return filter.map(function (item, index) {
             return _this.renderChild("filter/".concat(index), item, {
-                key: index + '',
-                onSubmit: function (data) { return _this.handleSearch({ query: data }); }
+                key: index + 'filter',
+                data: _this.props.store.filterData,
+                onSubmit: function (data) { return _this.handleSearch({ query: data }); },
+                onReset: function () {
+                    return _this.handleSearch({
+                        resetQuery: true,
+                        replaceQuery: true
+                    });
+                }
             });
         });
     };
@@ -620,8 +645,8 @@ var CRUD2 = /** @class */ (function (_super) {
                 popOverContainer: popOverContainer,
                 onSave: this.handleSave.bind(this),
                 onSaveOrder: this.handleSaveOrder,
-                onSearch: this.handleTableQuery,
-                onSort: this.handleTableQuery,
+                onSearch: this.handleQuerySearch,
+                onSort: this.handleQuerySearch,
                 onSelect: this.handleSelect,
                 data: store.mergedData,
                 loading: store.loading
@@ -678,6 +703,12 @@ var CRUD2 = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Number, Number]),
         tslib.__metadata("design:returntype", void 0)
     ], CRUD2.prototype, "handleChangePage", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Array, Array]),
+        tslib.__metadata("design:returntype", void 0)
+    ], CRUD2.prototype, "handleSaveOrder", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
@@ -689,7 +720,7 @@ var CRUD2 = /** @class */ (function (_super) {
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object, Boolean]),
         tslib.__metadata("design:returntype", void 0)
-    ], CRUD2.prototype, "handleTableQuery", null);
+    ], CRUD2.prototype, "handleQuerySearch", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/Calendar.d.ts

@@ -37,7 +37,6 @@ export interface CalendarSchema extends BaseSchema {
 export declare class CalendarRenderer extends DateControlRenderer {
     static defaultProps: {
         embed: boolean;
-        placeholder: string;
         dateFormat: string;
         timeFormat: string;
         strictMode: boolean;

package/lib/renderers/Calendar.js

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

package/lib/renderers/Card.d.ts

@@ -206,7 +206,7 @@ export declare class CardRenderer extends React.Component<CardProps> {
     isHaveLink(): any;
     handleClick(e: React.MouseEvent<HTMLDivElement>): void;
     handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object): void;
-    handleCheck(e: React.MouseEvent<any>): void;
+    handleCheck(): void;
     getPopOverContainer(): Element | Text | null;
     handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, options?: {
         resetOnFailed?: boolean;

package/lib/renderers/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -40,7 +40,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(amisCore.filter(href, data), {
                 type: 'button',
@@ -53,13 +53,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);
     };
@@ -72,7 +77,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;
@@ -83,7 +88,7 @@ var CardRenderer = /** @class */ (function (_super) {
             }
         }
         if (selectable && !hideCheckToggler) {
-            toolbars.push(React__default["default"].createElement(amisUi.Checkbox, { key: "check", className: cx('Card-checkbox'), type: multiple ? 'checkbox' : 'radio', disabled: !checkable, checked: selected, onChange: checkOnItemClick ? amisCore.noop : this.handleCheck }));
+            toolbars.push(React__default["default"].createElement(amisUi.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) {
@@ -347,7 +352,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 = tslib.__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 = tslib.__rest(_a, ["type", "className", "render", "style", "wrapperComponent", "contentsOnly", "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' });
@@ -359,9 +364,10 @@ var CardRenderer = /** @class */ (function (_super) {
             style.width = style.width || width;
             body = (React__default["default"].createElement("div", { style: { width: !/%/.test(String(width)) ? width : '' } }, body));
         }
-        if (!Component) {
+        if (contentsOnly) {
             return body;
         }
+        Component = Component || 'div';
         return (React__default["default"].createElement(Component, { style: style, className: className, tabIndex: tabIndex, onKeyUp: onKeyUp }, body));
     };
     CardItemFieldRenderer.defaultProps = tslib.__assign(tslib.__assign({}, TableCell.TableCell.defaultProps), { wrapperComponent: 'div' });
@@ -371,7 +377,7 @@ var CardRenderer = /** @class */ (function (_super) {
         'popOver',
         'copyable',
         'inline'
-    ], TableCell.TableCell.propsList, true);
+    ], tslib.__read(TableCell.TableCell.propsList), false);
     CardItemFieldRenderer = tslib.__decorate([
         amisCore.Renderer({
             type: 'card-item-field'

package/lib/renderers/Card2.js

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

package/lib/renderers/Cards.js

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