amis 6.14.0-beta.7 → 6.14.0-beta.9

package/lib/renderers/CRUD.d.ts

@@ -1,43 +1,66 @@
-/// <reference types="lodash" />
 import React from 'react';
-import { RendererProps } from 'amis-core';
-import { SchemaNode, Schema, ActionObject, PlainObject } from 'amis-core';
+import { RendererProps, AMISApi, AMISName, AMISFormBase, AMISSchemaCollection, AMISMessageConfig, AMISFunction, AMISLocalSource, AMISSpinnerConfig, AMISButtonSchema, AMISTemplate } from 'amis-core';
+import { SchemaNode, Schema, ActionObject, PlainObject, AMISExpression } from 'amis-core';
 import { ICRUDStore } from 'amis-core';
-import { BaseSchemaWithoutType } from 'amis-core';
 import { IScopedContext } from 'amis-core';
 import { SpinnerExtraProps } from 'amis-ui';
-import { BaseSchema, SchemaApi, SchemaClassName, SchemaExpression, SchemaMessage, SchemaName, SchemaObject, SchemaTokenizeableString, SchemaTpl, SchemaCollection, BaseFormSchema } from '../Schema';
-import { ActionSchema } from './Action';
-import { BaseCardsSchema } from './Cards';
-import { BaseListSchema } from './List';
-import { TableSchema, BaseTableSchema } from './Table';
-import type { TableRendererEvent } from './Table';
-import type { CardsRendererEvent } from './Cards';
-interface LoadMoreConfig {
+import { AMISClassName, SchemaObject as AMISSchema } from '../Schema';
+import { AMISListBase } from './List';
+import type { AMISTableBase, TableRendererEvent } from './Table';
+import type { AMISCardsBase, CardsRendererEvent } from './Cards';
+import { AMISSchemaBase } from 'amis-core';
+interface AMISLoadMoreConfig {
+    /**
+     * 是否显示加载图标
+     */
     showIcon?: boolean;
+    /**
+     * 是否显示加载文本
+     */
     showText?: boolean;
+    /**
+     * 加载按钮颜色
+     */
     color?: string;
+    /**
+     * 加载图标类型
+     */
     iconType?: string;
+    /**
+     * 加载文本内容配置
+     */
     contentText?: {
+        /**
+         * 下拉加载文本
+         */
         contentdown: string;
+        /**
+         * 释放加载文本
+         */
         contentrefresh: string;
+        /**
+         * 加载中文本
+         */
         contentnomore: string;
     };
     minLoadingTime?: number;
     dataAppendTo?: 'top' | 'bottom';
 }
-export type CRUDBultinToolbarType = 'columns-toggler' | 'drag-toggler' | 'pagination' | 'bulkActions' | 'bulk-actions' | 'statistics' | 'switch-per-page' | 'load-more' | 'filter-toggler' | 'export-csv' | 'export-excel';
-export interface CRUDBultinToolbar extends BaseSchemaWithoutType {
-    type: CRUDBultinToolbarType;
+/**
+ * 内置工具栏类型
+ */
+export type AMISCRUDBultinToolbarType = 'columns-toggler' | 'drag-toggler' | 'pagination' | 'bulkActions' | 'bulk-actions' | 'statistics' | 'switch-per-page' | 'load-more' | 'filter-toggler' | 'export-csv' | 'export-excel';
+export interface AMISCRUDBultinToolbar extends AMISSchemaBase {
+    type: AMISCRUDBultinToolbarType;
 }
-export type CRUDToolbarChild = SchemaObject | CRUDBultinToolbar;
-export type CRUDToolbarObject = {
+export type AMISCRUDToolbar = AMISSchema | AMISCRUDBultinToolbar;
+export type AMISCRUDToolbarExtra = {
     /**
      * 对齐方式
      */
     align?: 'left' | 'right';
 };
-export type AutoGenerateFilterObject = {
+export interface AMISAutoGenerateFilterObject {
     /**
      * 过滤条件单行列数
      */
@@ -62,30 +85,26 @@ export type AutoGenerateFilterObject = {
     /**
      * 启用批量操作的表达式
      */
-    enableBulkActionsOn?: SchemaExpression;
-};
+    enableBulkActionsOn?: AMISExpression;
+}
 export type CRUDRendererEvent = TableRendererEvent | CardsRendererEvent;
-export interface CRUDCommonSchemaWithoutType {
-    /**
-     * 指定内容区的展示模式。
-     */
-    mode?: 'table' | 'grid' | 'cards' | /* grid 的别名*/ 'list';
+export interface AMISCRUDBase extends AMISSchemaBase, AMISSpinnerConfig {
     /**
      * 初始化数据 API
      */
-    api?: SchemaApi;
+    api?: AMISApi;
     /**
      * 懒加载 API，当行数据中用 defer: true 标记了，则其孩子节点将会用这个 API 来拉取数据。
      */
-    deferApi?: SchemaApi;
+    deferApi?: AMISApi;
     /**
      * 批量操作
      */
-    bulkActions?: Array<ActionSchema>;
+    bulkActions?: Array<AMISButtonSchema>;
     /**
      * 单条操作
      */
-    itemActions?: Array<ActionSchema>;
+    itemActions?: Array<AMISButtonSchema>;
     /**
      * 每页个数，默认为 10，如果不是请设置。
      *
@@ -111,12 +130,12 @@ export interface CRUDCommonSchemaWithoutType {
     /**
      * 是否可通过拖拽排序，通过表达式来配置
      */
-    draggableOn?: SchemaExpression;
-    name?: SchemaName;
+    draggableOn?: AMISExpression;
+    name?: AMISName;
     /**
      * 过滤器表单
      */
-    filter?: BaseFormSchema;
+    filter?: AMISFormBase;
     /**
      * 初始是否拉取
      * @deprecated 建议用 api 的 sendOn 代替。
@@ -126,11 +145,11 @@ export interface CRUDCommonSchemaWithoutType {
      * 初始是否拉取，用表达式来配置。
      * @deprecated 建议用 api 的 sendOn 代替。
      */
-    initFetchOn?: SchemaExpression;
+    initFetchOn?: AMISExpression;
     /**
      * 配置内部 DOM 的 className
      */
-    innerClassName?: SchemaClassName;
+    innerClassName?: AMISClassName;
     /**
      * 设置自动刷新时间
      */
@@ -150,7 +169,7 @@ export interface CRUDCommonSchemaWithoutType {
      */
     perPageField?: string;
     /**
-     * 设置分页方向的字段名。单位简单分页时清楚时向前还是向后翻页。
+     * 设置分页方向的字段名。用于简单分页时确定是向前还是向后翻页。
      * @default pageDir
      */
     pageDirectionField?: string;
@@ -161,21 +180,21 @@ export interface CRUDCommonSchemaWithoutType {
     /**
      * 快速编辑后用来批量保存的 API
      */
-    quickSaveApi?: SchemaApi;
+    quickSaveApi?: AMISApi;
     /**
      * 快速编辑配置成及时保存时使用的 API
      */
-    quickSaveItemApi?: SchemaApi;
+    quickSaveItemApi?: AMISApi;
     /**
      * 保存排序的 api
      */
-    saveOrderApi?: SchemaApi;
+    saveOrderApi?: AMISApi;
     /**
      * 是否将过滤条件的参数同步到地址栏,默认为true
      * @default true
      */
     syncLocation?: boolean;
-    toolbar?: SchemaCollection;
+    toolbar?: AMISSchemaCollection;
     /**
      * 工具栏是否为 inline 模式
      */
@@ -183,16 +202,16 @@ export interface CRUDCommonSchemaWithoutType {
     /**
      * 顶部工具栏
      */
-    headerToolbar?: Array<(CRUDToolbarChild & CRUDToolbarObject) | CRUDBultinToolbarType>;
+    headerToolbar?: Array<(AMISCRUDToolbar & AMISCRUDToolbarExtra) | AMISCRUDBultinToolbarType>;
     /**
      * 底部工具栏
      */
-    footerToolbar?: Array<(CRUDToolbarChild & CRUDToolbarObject) | CRUDBultinToolbarType>;
+    footerToolbar?: Array<(AMISCRUDToolbar & AMISCRUDToolbarExtra) | AMISCRUDBultinToolbarType>;
     /**
-     * 每页显示多少个空间成员的配置如： [10, 20, 50, 100]。
+     * 每页显示多少条记录的配置如： [10, 20, 50, 100]。
      */
     perPageAvailable?: Array<number>;
-    messages?: SchemaMessage;
+    messages?: AMISMessageConfig;
     /**
      * 是否隐藏快速编辑的按钮。
      */
@@ -205,7 +224,7 @@ export interface CRUDCommonSchemaWithoutType {
      * 静默拉取
      */
     silentPolling?: boolean;
-    stopAutoRefreshWhen?: SchemaExpression;
+    stopAutoRefreshWhen?: AMISExpression;
     stopAutoRefreshWhenModalIsOpen?: boolean;
     filterTogglable?: boolean | {
         label?: string;
@@ -229,7 +248,7 @@ export interface CRUDCommonSchemaWithoutType {
     /**
      * 当配置 keepItemSelectionOnPageChange 时有用，用来配置已勾选项的文案。
      */
-    labelTpl?: SchemaTpl;
+    labelTpl?: AMISTemplate;
     /**
      * 是否为前端单次加载模式，可以用来实现前端分页。
      */
@@ -255,13 +274,17 @@ export interface CRUDCommonSchemaWithoutType {
      *  * `options.matchSorter` 系统默认的排序方法
      * @since 3.5.0
      */
-    matchFunc?: string | any;
+    matchFunc?: AMISFunction<(items: Array<any>, itemsRaw: Array<any>, options: {
+        query: Record<string, any>;
+        columns: Array<any>;
+        matchSorter: (items: Array<any>, value: string) => Array<any>;
+    }) => Array<any>>;
     /**
      * 也可以直接从环境变量中读取，但是不太推荐。
      */
-    source?: SchemaTokenizeableString;
+    source?: AMISLocalSource;
     /**
-     * 如果时内嵌模式，可以通过这个来配置默认的展开选项。
+     * 如果是内嵌模式，通过这个来配置默认的展开选项。
      */
     expandConfig?: {
         /**
@@ -284,11 +307,7 @@ export interface CRUDCommonSchemaWithoutType {
     /**
      * 开启查询区域，会根据列元素的searchable属性值，自动生成查询条件表单
      */
-    autoGenerateFilter?: AutoGenerateFilterObject | boolean;
-    /**
-     * 内容区域占满屏幕剩余空间
-     */
-    autoFillHeight?: TableSchema['autoFillHeight'];
+    autoGenerateFilter?: AMISAutoGenerateFilterObject | boolean;
     /**
      * 是否开启Query信息转换，开启后将会对url中的Query进行转换，默认开启，默认仅转化布尔值
      */
@@ -308,32 +327,59 @@ export interface CRUDCommonSchemaWithoutType {
     /**
      * 加载更多配置
      */
-    loadMoreProps?: LoadMoreConfig;
+    loadMoreProps?: AMISLoadMoreConfig;
 }
-export interface CRUDCommonSchema extends CRUDCommonSchemaWithoutType, BaseSchema, SpinnerExtraProps {
+export interface AMISCRUDDefault extends AMISCRUDBase, AMISTableBase {
     /**
      *  指定为 CRUD 渲染器。
      */
     type: 'crud';
 }
-export interface CRUDCardsSchema extends CRUDCommonSchemaWithoutType, BaseCardsSchema {
+export interface AMISCRUDCards extends AMISCRUDBase, AMISCardsBase {
+    /**
+     *  指定为 cards 模式。
+     */
     mode: 'cards';
+    /**
+     *  指定为 CRUD 渲染器。
+     */
     type: 'crud';
 }
-export interface CRUDListSchema extends CRUDCommonSchemaWithoutType, BaseListSchema {
+export interface AMISCRUDList extends AMISCRUDBase, AMISListBase {
+    /**
+     *  指定为 list 模式。
+     */
     mode: 'list';
+    /**
+     *  指定为 CRUD 渲染器。
+     */
     type: 'crud';
 }
-export interface CRUDTableSchema extends CRUDCommonSchemaWithoutType, BaseTableSchema {
-    mode?: 'table';
+export interface AMISCRUDTable extends AMISCRUDBase, AMISTableBase {
+    /**
+     *  指定为 table 模式。
+     */
+    mode: 'table';
+    /**
+     *  指定为 CRUD 渲染器。
+     */
     type: 'crud';
 }
 /**
  * CRUD 增删改查渲染器。
  * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/crud
  */
-export type CRUDSchema = CRUDCardsSchema | CRUDListSchema | CRUDTableSchema;
-export interface CRUDProps extends RendererProps, Omit<CRUDCommonSchema, 'type' | 'className'>, SpinnerExtraProps {
+/**
+ * 列表组件：CRUD 增删改查渲染器。支持表格（table）、卡片（cards）、列表（list）等多种展示模式，同时整合了筛选、排序、批量操作、分页等常用功能。
+ * 支持灵活的数据源配置、列配置、行操作、自定义工具栏、选择与批量操作、异步加载、懒加载、无限滚动，以及多种事件分发机制。
+ * 适合用于复杂业务场景下的数据增删改查页面的快速搭建。
+ *
+ * @schemaType crud
+ * @displayName 增删改查（CRUD）
+ */
+export type AMISCRUDSchema = AMISCRUDTable | AMISCRUDCards | AMISCRUDList | AMISCRUDDefault;
+export type AMISCRUDCommonSchema = AMISCRUDCards | AMISCRUDList | AMISCRUDTable;
+export interface CRUDProps extends RendererProps, Omit<AMISCRUDBase, 'type' | 'className'>, SpinnerExtraProps {
     store: ICRUDStore;
     pickerMode?: boolean;
 }
@@ -417,7 +463,7 @@ export default class CRUD<T extends CRUDProps> extends React.Component<T, any> {
     closeTarget(target: string): void;
     doAction(action: ActionObject, data: object, throwErrors?: boolean, args?: any): Promise<any>;
     dispatchEvent(e: React.MouseEvent<any> | string, data: any, renderer?: React.Component<RendererProps>, // for didmount
-    scoped?: IScopedContext): Promise<import("amis-core").RendererEvent<any, any>>;
+    scoped?: IScopedContext): Promise<import("amis-core").RendererEvent<any>>;
     unSelectItem(item: any, index: number): void;
     clearSelection(): void;
     hasBulkActionsToolbar(): any;
@@ -429,8 +475,8 @@ export default class CRUD<T extends CRUDProps> extends React.Component<T, any> {
     renderLoadMore(): React.JSX.Element;
     renderFilterToggler(): React.JSX.Element | null;
     renderExportCSV(toolbar: Schema): React.JSX.Element;
-    renderToolbar(toolbar?: SchemaNode, index?: number, childProps?: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null;
-    renderHeaderToolbar(childProps: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null;
+    renderToolbar(toolbar?: AMISCRUDToolbar & AMISCRUDToolbarExtra, index?: number, childProps?: any, toolbarRenderer?: (toolbar: AMISCRUDToolbar & AMISCRUDToolbarExtra, index: number) => React.ReactNode): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null;
+    renderHeaderToolbar(childProps: any, toolbarRenderer?: (toolbar: AMISCRUDToolbar & AMISCRUDToolbarExtra, index: number) => React.ReactNode): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null;
     renderFooterToolbar(childProps: any, toolbarRenderer?: (toolbar: SchemaNode, index: number) => React.ReactNode): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null;
     renderTag(item: any, index: number): React.JSX.Element;
     renderSelection(): React.ReactNode;

package/lib/renderers/CRUD.js

@@ -1,6 +1,6 @@
 /**
- * amis v6.14.0-beta.7
- * build time: 2025-10-17
+ * amis v6.14.0-beta.9
+ * build time: 2025-10-29
  * Copyright 2018-2025 baidu
  */
 
@@ -422,7 +422,7 @@ var CRUD = /** @class */function (_super) {
         items: options || []
       }, '${items}', {
         columns: (_a = store.columns) !== null && _a !== void 0 ? _a : columns,
-        matchFunc: matchFunc,
+        matchFunc: typeof matchFunc === 'string' ? amisCore.str2function(matchFunc) : matchFunc,
         totalField: totalField
       });
       var val = void 0;
@@ -579,21 +579,21 @@ var CRUD = /** @class */function (_super) {
       }, _this.context);
     });
   };
-  CRUD.prototype.search = function (values, silent, clearSelection, forceReload, isInit) {
-    var _a, _b, _c, _d, _e, _f;
-    if (forceReload === void 0) {
-      forceReload = false;
-    }
-    if (isInit === void 0) {
-      isInit = false;
-    }
-    return tslib.__awaiter(this, void 0, void 0, function () {
-      var _g, store, api, messages, pageField, perPageField, totalField, interval, stopAutoRefreshWhen, stopAutoRefreshWhenModalIsOpen, silentPolling, syncLocation, syncResponse2Query, pickerMode, env, loadDataOnce, loadDataOnceFetchOnFilter, source, columns, dispatchEvent, options, loadDataMode, data, matchFunc, value, page, lastPage, msg, error, rendererEvent, rendererEvent, val;
-      var _h;
+  CRUD.prototype.search = function (values_1, silent_1, clearSelection_1) {
+    return tslib.__awaiter(this, arguments, void 0, function (values, silent, clearSelection, forceReload, isInit) {
+      var _a, store, api, messages, pageField, perPageField, totalField, interval, stopAutoRefreshWhen, stopAutoRefreshWhenModalIsOpen, silentPolling, syncLocation, syncResponse2Query, pickerMode, env, loadDataOnce, loadDataOnceFetchOnFilter, source, columns, dispatchEvent, options, loadDataMode, data, matchFunc, value, page, lastPage, msg, error, rendererEvent, rendererEvent, val;
+      var _b;
+      var _c, _d, _e, _f, _g, _h;
+      if (forceReload === void 0) {
+        forceReload = false;
+      }
+      if (isInit === void 0) {
+        isInit = false;
+      }
       return tslib.__generator(this, function (_j) {
         switch (_j.label) {
           case 0:
-            _g = this.props, store = _g.store, api = _g.api, messages = _g.messages, pageField = _g.pageField, perPageField = _g.perPageField, totalField = _g.totalField, interval = _g.interval, stopAutoRefreshWhen = _g.stopAutoRefreshWhen, stopAutoRefreshWhenModalIsOpen = _g.stopAutoRefreshWhenModalIsOpen, silentPolling = _g.silentPolling, syncLocation = _g.syncLocation, syncResponse2Query = _g.syncResponse2Query, pickerMode = _g.pickerMode, env = _g.env, loadDataOnce = _g.loadDataOnce, loadDataOnceFetchOnFilter = _g.loadDataOnceFetchOnFilter, source = _g.source, columns = _g.columns, dispatchEvent = _g.dispatchEvent, options = _g.options;
+            _a = this.props, store = _a.store, api = _a.api, messages = _a.messages, pageField = _a.pageField, perPageField = _a.perPageField, totalField = _a.totalField, interval = _a.interval, stopAutoRefreshWhen = _a.stopAutoRefreshWhen, stopAutoRefreshWhenModalIsOpen = _a.stopAutoRefreshWhenModalIsOpen, silentPolling = _a.silentPolling, syncLocation = _a.syncLocation, syncResponse2Query = _a.syncResponse2Query, pickerMode = _a.pickerMode, env = _a.env, loadDataOnce = _a.loadDataOnce, loadDataOnceFetchOnFilter = _a.loadDataOnceFetchOnFilter, source = _a.source, columns = _a.columns, dispatchEvent = _a.dispatchEvent, options = _a.options;
             // reload 需要清空用户选择，无论是否开启keepItemSelectionOnPageChange
             if (clearSelection && !pickerMode) {
               store.resetSelection();
@@ -607,7 +607,7 @@ var CRUD = /** @class */function (_super) {
             values && store.updateQuery(values, !loadDataMode && syncLocation && env && env.updateLocation ? env.updateLocation : undefined, pageField, perPageField);
             this.lastQuery = store.query;
             data = amisCore.createObject(store.data, store.query);
-            matchFunc = ((_a = this.props) === null || _a === void 0 ? void 0 : _a.matchFunc) && typeof this.props.matchFunc === 'string' ? amisCore.str2function(this.props.matchFunc, 'items', 'itemsRaw', 'options') : undefined;
+            matchFunc = ((_c = this.props) === null || _c === void 0 ? void 0 : _c.matchFunc) && typeof this.props.matchFunc === 'string' ? amisCore.str2function(this.props.matchFunc, 'items', 'itemsRaw', 'options') : undefined;
             if (!amisCore.isEffectiveApi(api, data)) return [3 /*break*/, 8];
             return [4 /*yield*/, store.fetchInitData(api, data, {
               successMessage: messages && messages.fetchSuccess,
@@ -622,7 +622,7 @@ var CRUD = /** @class */function (_super) {
               totalField: totalField,
               loadDataMode: loadDataMode,
               syncResponse2Query: syncResponse2Query,
-              columns: (_b = store.columns) !== null && _b !== void 0 ? _b : columns,
+              columns: (_d = store.columns) !== null && _d !== void 0 ? _d : columns,
               matchFunc: matchFunc,
               filterOnAllColumns: loadDataOnceFetchOnFilter === false,
               minLoadingTime: values === null || values === void 0 ? void 0 : values.minLoadingTime,
@@ -636,7 +636,7 @@ var CRUD = /** @class */function (_super) {
             page = store.page, lastPage = store.lastPage, msg = store.msg, error = store.error;
             if (!isInit) return [3 /*break*/, 3];
             return [4 /*yield*/, dispatchEvent === null || dispatchEvent === void 0 ? void 0 : dispatchEvent('fetchInited', amisCore.createObject(this.props.data, {
-              responseData: (value === null || value === void 0 ? void 0 : value.ok) ? (_c = store.data) !== null && _c !== void 0 ? _c : {} : value,
+              responseData: (value === null || value === void 0 ? void 0 : value.ok) ? (_e = store.data) !== null && _e !== void 0 ? _e : {} : value,
               responseStatus: (value === null || value === void 0 ? void 0 : value.status) === undefined ? error ? 1 : 0 : value === null || value === void 0 ? void 0 : value.status,
               responseMsg: msg
             }))];
@@ -648,7 +648,7 @@ var CRUD = /** @class */function (_super) {
             return [3 /*break*/, 5];
           case 3:
             return [4 /*yield*/, dispatchEvent === null || dispatchEvent === void 0 ? void 0 : dispatchEvent('research', amisCore.createObject(this.props.data, {
-              responseData: (value === null || value === void 0 ? void 0 : value.ok) ? (_d = store.data) !== null && _d !== void 0 ? _d : {} : value,
+              responseData: (value === null || value === void 0 ? void 0 : value.ok) ? (_f = store.data) !== null && _f !== void 0 ? _f : {} : value,
               responseStatus: (value === null || value === void 0 ? void 0 : value.status) === undefined ? error ? 1 : 0 : value === null || value === void 0 ? void 0 : value.status,
               responseMsg: msg
             }))];
@@ -660,7 +660,7 @@ var CRUD = /** @class */function (_super) {
             _j.label = 5;
           case 5:
             if (!(!loadDataOnce && !store.data.items.length && !interval && page > 1 && lastPage < page)) return [3 /*break*/, 7];
-            return [4 /*yield*/, this.search(tslib.__assign(tslib.__assign({}, store.query), (_h = {}, _h[pageField || 'page'] = lastPage, _h)), false, undefined)];
+            return [4 /*yield*/, this.search(tslib.__assign(tslib.__assign({}, store.query), (_b = {}, _b[pageField || 'page'] = lastPage, _b)), false, undefined)];
           case 6:
             _j.sent();
             _j.label = 7;
@@ -672,7 +672,7 @@ var CRUD = /** @class */function (_super) {
           case 8:
             if (source) {
               store.initFromScope(data, source, {
-                columns: (_e = store.columns) !== null && _e !== void 0 ? _e : columns,
+                columns: (_g = store.columns) !== null && _g !== void 0 ? _g : columns,
                 matchFunc: matchFunc,
                 totalField: totalField
               });
@@ -680,7 +680,7 @@ var CRUD = /** @class */function (_super) {
               store.initFromScope({
                 items: options || []
               }, '${items}', {
-                columns: (_f = store.columns) !== null && _f !== void 0 ? _f : columns,
+                columns: (_h = store.columns) !== null && _h !== void 0 ? _h : columns,
                 matchFunc: matchFunc,
                 totalField: totalField
               });
@@ -704,15 +704,15 @@ var CRUD = /** @class */function (_super) {
     return this.search(values, true, clearSelection, forceReload);
   };
   CRUD.prototype.handleChangePage = function (page, perPage, dir) {
-    var _a;
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var _b, store, syncLocation, env, pageField, perPageField, pageDirectionField, autoJumpToTopOnPagerChange, __, api, loadDataOnce, confirmed, query, scrolledY;
+      var _a, store, syncLocation, env, pageField, perPageField, pageDirectionField, autoJumpToTopOnPagerChange, __, api, loadDataOnce, confirmed, query, scrolledY;
+      var _b;
       var _c;
       return tslib.__generator(this, function (_d) {
         switch (_d.label) {
           case 0:
-            _b = this.props, store = _b.store, syncLocation = _b.syncLocation, env = _b.env, pageField = _b.pageField, perPageField = _b.perPageField, pageDirectionField = _b.pageDirectionField, autoJumpToTopOnPagerChange = _b.autoJumpToTopOnPagerChange, __ = _b.translate, api = _b.api, loadDataOnce = _b.loadDataOnce;
-            if (!(api && !loadDataOnce && ((_a = this.control) === null || _a === void 0 ? void 0 : _a.hasModifiedItems()))) return [3 /*break*/, 2];
+            _a = this.props, store = _a.store, syncLocation = _a.syncLocation, env = _a.env, pageField = _a.pageField, perPageField = _a.perPageField, pageDirectionField = _a.pageDirectionField, autoJumpToTopOnPagerChange = _a.autoJumpToTopOnPagerChange, __ = _a.translate, api = _a.api, loadDataOnce = _a.loadDataOnce;
+            if (!(api && !loadDataOnce && ((_c = this.control) === null || _c === void 0 ? void 0 : _c.hasModifiedItems()))) return [3 /*break*/, 2];
             return [4 /*yield*/, _confirm__default["default"](__('CRUD.confirmLeaveUnSavedPage'))];
           case 1:
             confirmed = _d.sent();
@@ -721,7 +721,7 @@ var CRUD = /** @class */function (_super) {
             }
             _d.label = 2;
           case 2:
-            query = (_c = {}, _c[pageField || 'page'] = page, _c);
+            query = (_b = {}, _b[pageField || 'page'] = page, _b);
             if (dir) {
               query[pageDirectionField || 'pageDir'] = dir;
             }
@@ -1163,13 +1163,13 @@ var CRUD = /** @class */function (_super) {
   CRUD.prototype.closeTarget = function (target) {
     // implement this.
   };
-  CRUD.prototype.doAction = function (action, data, throwErrors, args) {
-    var _a;
-    if (throwErrors === void 0) {
-      throwErrors = false;
-    }
-    return tslib.__awaiter(this, void 0, void 0, function () {
+  CRUD.prototype.doAction = function (action_1, data_3) {
+    return tslib.__awaiter(this, arguments, void 0, function (action, data, throwErrors, args) {
       var store, selectedItems_1, unSelectedItems;
+      var _a;
+      if (throwErrors === void 0) {
+        throwErrors = false;
+      }
       return tslib.__generator(this, function (_b) {
         switch (_b.label) {
           case 0:
@@ -1324,7 +1324,7 @@ var CRUD = /** @class */function (_super) {
       });
     }), itemBtns.map(function (btn, index) {
       return render("bulk-action/".concat(index), tslib.__assign(tslib.__assign({}, omit__default["default"](btn, ['visibleOn', 'hiddenOn', 'disabledOn'])), {
-        type: 'button'
+        type: btn.type || 'button'
       }), {
         key: "item-".concat(index),
         data: itemData,
@@ -1363,8 +1363,7 @@ var CRUD = /** @class */function (_super) {
     return _J$X_("div", {
       className: cx('Crud-pager')
     }, render('pagination', {
-      type: 'pagination',
-      testIdBuilder: testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('pagination')
+      type: 'pagination'
     }, tslib.__assign(tslib.__assign({}, extraProps), {
       activePage: page,
       lastPage: lastPage,
@@ -1372,7 +1371,8 @@ var CRUD = /** @class */function (_super) {
       mode: store.mode,
       perPage: store.perPage,
       popOverContainer: this.parentContainer,
-      onPageChange: this.handleChangePage
+      onPageChange: this.handleChangePage,
+      testIdBuilder: testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('pagination')
     })));
   };
   CRUD.prototype.renderStatistics = function () {
@@ -1759,10 +1759,10 @@ var CRUD = /** @class */function (_super) {
       submitText: __('search')
     }, filter), {
       type: 'form',
-      api: null,
-      testIdBuilder: testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('filter')
+      api: undefined
     }), {
       key: 'filter',
+      testIdBuilder: testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('filter'),
       panelClassName: cx('Crud-filter', filter.panelClassName || 'Panel--default'),
       className: cx(filter.className, filter.wrapWithPanel ? '' : 'Crud-filter'),
       data: store.filterData,
@@ -2006,9 +2006,9 @@ var CRUDRendererBase = /** @class */function (_super) {
     scoped.close(target);
   };
   CRUDRendererBase.prototype.setData = function (values, replace, index, condition) {
-    var _a, _b, _c;
     return tslib.__awaiter(this, void 0, void 0, function () {
       var store, total, items;
+      var _a, _b, _c;
       return tslib.__generator(this, function (_d) {
         store = this.props.store;
         if (index !== undefined || condition !== undefined) {