amis 2.8.0 → 3.0.0

package/esm/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -7,6 +7,7 @@ import { __extends, __awaiter, __generator, __assign, __rest, __decorate, __meta
 import React from 'react';
 import isEqual from 'lodash/isEqual';
 import pickBy from 'lodash/pickBy';
+import omitBy from 'lodash/omitBy';
 import { parseQuery, getPropValue, anyChanged, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, filter, createObject, isVisible, str2function, qsparse, qsstringify, isEffectiveApi, evalExpression, extendObject, getExprProperties, getVariable, ScopedContext, Renderer, CRUDStore } from 'amis-core';
 import { Select, Button, Icon, Html } from 'amis-ui';
 import pick from 'lodash/pick';
@@ -15,6 +16,18 @@ import omit from 'lodash/omit';
 import find from 'lodash/find';
 import findIndex from 'lodash/findIndex';
 
+var INNER_EVENTS = [
+    'selectedChange',
+    'columnSort',
+    'columnFilter',
+    'columnSearch',
+    'columnToggled',
+    'orderChange',
+    'rowClick',
+    'rowMouseEnter',
+    'rowMouseLeave',
+    'selected'
+];
 var CRUD = /** @class */ (function (_super) {
     __extends(CRUD, _super);
     function CRUD(props) {
@@ -194,7 +207,7 @@ var CRUD = /** @class */ (function (_super) {
                             redirect = action.redirect && filter(action.redirect, data);
                             redirect && !action.blank && env.jumpTo(redirect, action);
                             action.reload
-                                ? this.reloadTarget(action.reload, data)
+                                ? this.reloadTarget(filter(action.reload, data), data)
                                 : redirect
                                     ? null
                                     : this.search(undefined, undefined, true, true);
@@ -272,7 +285,7 @@ var CRUD = /** @class */ (function (_super) {
                                     _b.label = 2;
                                 case 2:
                                     action.reload
-                                        ? this.reloadTarget(action.reload, data)
+                                        ? this.reloadTarget(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 && filter(action.redirect, data);
@@ -412,7 +425,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(filter(reload, ctx), ctx);
         }
         var redirect = (_d = action.redirect) !== null && _d !== void 0 ? _d : dialogAction.redirect;
         redirect = redirect && filter(redirect, ctx);
@@ -555,7 +568,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(filter(finalReload, data_1), data_1)
                     : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -577,7 +590,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(filter(finalReload, data_2), data_2)
                     : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () {
@@ -664,7 +677,7 @@ var CRUD = /** @class */ (function (_super) {
             store
                 .saveRemote(saveOrderApi, model)
                 .then(function () {
-                reload && _this.reloadTarget(reload, model);
+                reload && _this.reloadTarget(filter(reload, model), model);
                 _this.search(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -824,7 +837,8 @@ var CRUD = /** @class */ (function (_super) {
     };
     CRUD.prototype.renderBulkActions = function (childProps) {
         var _this = this;
-        var _a = this.props, bulkActions = _a.bulkActions, itemActions = _a.itemActions, store = _a.store, render = _a.render, cx = _a.classnames;
+        var _a;
+        var _b = this.props, bulkActions = _b.bulkActions, itemActions = _b.itemActions, store = _b.store, render = _b.render, cx = _b.classnames, primaryField = _b.primaryField;
         if (!bulkActions || !bulkActions.length) {
             return null;
         }
@@ -833,9 +847,19 @@ var CRUD = /** @class */ (function (_super) {
         var bulkBtns = [];
         var itemBtns = [];
         var ctx = createObject(store.mergedData, {
-            currentPageData: store.mergedData.items.concat(),
+            currentPageData: (((_a = store.mergedData) === null || _a === void 0 ? void 0 : _a.items) || []).concat(),
+            rows: selectedItems.concat(),
+            items: selectedItems.concat(),
             selectedItems: selectedItems.concat(),
-            unSelectedItems: unSelectedItems.concat()
+            unSelectedItems: unSelectedItems.concat(),
+            ids: selectedItems
+                .map(function (item) {
+                return item.hasOwnProperty(primaryField)
+                    ? item[primaryField]
+                    : null;
+            })
+                .filter(function (item) { return item; })
+                .join(',')
         });
         // const ctx = createObject(store.data, {
         //     ...store.query,
@@ -892,6 +916,8 @@ var CRUD = /** @class */ (function (_super) {
             extraProps.maxButtons = toolbar.maxButtons;
             extraProps.layout = toolbar.layout;
             extraProps.popOverContainerSelector = toolbar.popOverContainerSelector;
+            extraProps.perPageAvailable = toolbar.perPageAvailable;
+            extraProps.total = resolveVariableAndFilter(toolbar.total, store.data);
         }
         else {
             extraProps.showPageInput = lastPage > 9;
@@ -1039,8 +1065,8 @@ var CRUD = /** @class */ (function (_super) {
             // 因为会把数据呈现在地址栏上。
             data: createObject(createObject(store.filterData, {
                 items: childProps.items,
-                selectedItems: childProps.selectedItems,
-                unSelectedItems: childProps.unSelectedItems
+                selectedItems: store.selectedItems.concat(),
+                unSelectedItems: store.unSelectedItems.concat()
             }), {}),
             page: store.page,
             lastPage: store.lastPage,
@@ -1089,7 +1115,7 @@ var CRUD = /** @class */ (function (_super) {
     };
     CRUD.prototype.renderSelection = function () {
         var _this = this;
-        var _a = this.props, store = _a.store, cx = _a.classnames, labelField = _a.labelField, labelTpl = _a.labelTpl, primaryField = _a.primaryField, __ = _a.translate;
+        var _a = this.props, store = _a.store, cx = _a.classnames, labelField = _a.labelField, labelTpl = _a.labelTpl, primaryField = _a.primaryField, __ = _a.translate, env = _a.env;
         if (!store.selectedItems.length) {
             return null;
         }
@@ -1097,13 +1123,13 @@ var CRUD = /** @class */ (function (_super) {
             React.createElement("div", { className: cx('Crud-selectionLabel') }, __('CRUD.selected', { total: store.selectedItems.length })),
             store.selectedItems.map(function (item, index) { return (React.createElement("div", { key: index, className: cx("Crud-value") },
                 React.createElement("span", { "data-tooltip": __('delete'), "data-position": "bottom", className: cx('Crud-valueIcon'), onClick: _this.unSelectItem.bind(_this, item, index) }, "\u00D7"),
-                React.createElement("span", { className: cx('Crud-valueLabel') }, labelTpl ? (React.createElement(Html, { html: filter(labelTpl, item) })) : (getVariable(item, labelField || 'label') ||
+                React.createElement("span", { className: cx('Crud-valueLabel') }, labelTpl ? (React.createElement(Html, { html: filter(labelTpl, item), filterHtml: env.filterHtml })) : (getVariable(item, labelField || 'label') ||
                     getVariable(item, primaryField || 'id'))))); }),
             React.createElement("a", { onClick: this.clearSelection, className: cx('Crud-selectionClear') }, __('clear'))));
     };
     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 = __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, onEvent = _b.onEvent; _b.onSave; _b.onSaveOrder; _b.onPopOverOpened; _b.onPopOverClosed; _b.onSearchableFromReset; _b.onSearchableFromSubmit; _b.onSearchableFromInit; _b.headerToolbarRender; _b.footerToolbarRender; var rest = __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.createElement("div", { className: cx('Crud', className, {
                 'is-loading': store.loading
             }), style: style },
@@ -1121,7 +1147,10 @@ var CRUD = /** @class */ (function (_super) {
             keepItemSelectionOnPageChange && multiple !== false
                 ? this.renderSelection()
                 : null,
-            render('body', __assign(__assign({}, rest), { columns: (_a = store.columns) !== null && _a !== void 0 ? _a : rest.columns, type: mode || 'table' }), {
+            render('body', __assign(__assign({}, rest), { 
+                // 通用事件 例如cus-event 如果直接透传给table 则会被触发2次
+                // 因此只将下层组件table、cards中自定义事件透传下去 否则通过crud配置了也不会执行
+                onEvent: omitBy(onEvent, function (event, key) { return !INNER_EVENTS.includes(key); }), columns: (_a = store.columns) !== null && _a !== void 0 ? _a : rest.columns, type: mode || 'table' }), {
                 key: 'body',
                 className: cx('Crud-body', bodyClassName),
                 ref: this.controlRef,
@@ -1222,6 +1251,7 @@ var CRUD = /** @class */ (function (_super) {
         'onChange',
         'onInit',
         'onSaved',
+        'onSave',
         'onQuery',
         'formStore',
         'autoFillHeight'

package/esm/renderers/CRUD2.d.ts

@@ -1,15 +1,17 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
-import { Action } from '../types';
 import { ICRUDStore } from 'amis-core';
 import { IScopedContext } from 'amis-core';
 import { SpinnerExtraProps } from 'amis-ui';
+import { Action } from '../types';
 import { BaseSchema, SchemaApi, SchemaExpression, SchemaName, SchemaObject, SchemaTokenizeableString } from '../Schema';
 import { CardsSchema } from './Cards';
 import { ListSchema } from './List';
 import { TableSchema2 } from './Table2';
+import type { Table2RendererEvent } from './Table2';
+import type { CardsRendererEvent } from './Cards';
 import { SchemaCollection } from '../Schema';
-export type CRUDRendererEvent = 'search';
+export type CRUDRendererEvent = Table2RendererEvent | CardsRendererEvent;
 export interface CRUD2CommonSchema extends BaseSchema, SpinnerExtraProps {
     /**
      *  指定为 CRUD2 渲染器。
@@ -166,6 +168,7 @@ export default class CRUD2 extends React.Component<CRUD2Props, any> {
         query?: object;
         resetQuery?: boolean;
         replaceQuery?: boolean;
+        loadMore?: boolean;
     }): void;
     handleStopAutoRefresh(): void;
     handleStartAutoRefresh(): void;

package/esm/renderers/CRUD2.js

@@ -1,17 +1,30 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { parseQuery, getPropValue, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, qsparse, qsstringify, createObject, isEffectiveApi, evalExpression, extendObject, filter, getVariable, autobind, ScopedContext, Renderer, CRUDStore } from 'amis-core';
+import omitBy from 'lodash/omitBy';
+import { parseQuery, getPropValue, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, qsparse, qsstringify, createObject, isEffectiveApi, evalExpression, filter, extendObject, getVariable, autobind, ScopedContext, Renderer, CRUDStore } from 'amis-core';
 import pick from 'lodash/pick';
 import { findDOMNode } from 'react-dom';
 import findIndex from 'lodash/findIndex';
 import { Html } from 'amis-ui';
 import upperFirst from 'lodash/upperFirst';
 
+var INNER_EVENTS = [
+    'selectedChange',
+    'columnSort',
+    'columnFilter',
+    'columnSearch',
+    'columnToggled',
+    'orderChange',
+    'rowClick',
+    'rowMouseEnter',
+    'rowMouseLeave',
+    'selected'
+];
 var CRUD2 = /** @class */ (function (_super) {
     __extends(CRUD2, _super);
     function CRUD2(props) {
@@ -112,7 +125,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;
@@ -120,7 +133,8 @@ var CRUD2 = /** @class */ (function (_super) {
         }
         this.handleSearch({
             query: __assign(__assign(__assign({}, params), values), store.query),
-            replaceQuery: this.props.initFetch !== false
+            replaceQuery: this.props.initFetch !== false,
+            loadMore: loadType === 'more'
         });
         // 保留一次用于重置查询条件
         store.setPristineQuery();
@@ -129,6 +143,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);
     };
     /**
@@ -136,7 +152,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
                 ? qsparse(qsstringify(query, undefined, true))
@@ -144,8 +160,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);
@@ -179,7 +196,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 &&
@@ -192,6 +209,11 @@ var CRUD2 = /** @class */ (function (_super) {
         this.lastQuery = store.query;
         var loadDataMode = loadMore !== null && loadMore !== void 0 ? loadMore : loadType === 'more';
         var data = createObject(store.data, store.query);
+        // handleLoadMore 是在事件触发后才执行，首次加载并不走到 handleLoadMore
+        // 所以加载更多模式下，首次加载也需要使用设置的 perPage，避免前后 perPage 不一致导致的问题
+        if (loadDataMode && perPage) {
+            store.changePerPage(perPage);
+        }
         isEffectiveApi(api, data)
             ? store
                 .fetchInitData(api, data, {
@@ -205,7 +227,7 @@ var CRUD2 = /** @class */ (function (_super) {
                 silent: silent,
                 pageField: pageField,
                 perPageField: perPageField,
-                loadDataMode: loadDataMode,
+                loadDataMode: false,
                 syncResponse2Query: syncResponse2Query,
                 columns: (_a = store.columns) !== null && _a !== void 0 ? _a : columns,
                 isTable2: true
@@ -271,8 +293,8 @@ var CRUD2 = /** @class */ (function (_super) {
                 errorMessage: messages && messages.saveSuccess
             })
                 .then(function () {
-                reload && _this.reloadTarget(reload, data_1);
-                _this.getData(undefined, undefined, true, true);
+                reload && _this.reloadTarget(filter(reload, data_1), data_1);
+                _this.getData(undefined, undefined, true);
             })
                 .catch(function () { });
         }
@@ -290,8 +312,8 @@ var CRUD2 = /** @class */ (function (_super) {
             store
                 .saveRemote(quickSaveItemApi, sendData)
                 .then(function () {
-                reload && _this.reloadTarget(reload, data_2);
-                _this.getData(undefined, undefined, true, true);
+                reload && _this.reloadTarget(filter(reload, data_2), data_2);
+                _this.getData(undefined, undefined, true);
             })
                 .catch(function () {
                 (options === null || options === void 0 ? void 0 : options.resetOnFailed) && _this.control.reset();
@@ -377,8 +399,8 @@ var CRUD2 = /** @class */ (function (_super) {
             store
                 .saveRemote(saveOrderApi, model)
                 .then(function () {
-                reload && _this.reloadTarget(reload, model);
-                _this.getData(undefined, undefined, true, true);
+                reload && _this.reloadTarget(filter(reload, model), model);
+                _this.getData(undefined, undefined, true);
             })
                 .catch(function () { });
     };
@@ -462,14 +484,14 @@ var CRUD2 = /** @class */ (function (_super) {
         store.updateQuery(__assign(__assign({}, values), (_a = {}, _a[pageField || 'page'] = 1, _a)), syncLocation && env && env.updateLocation
             ? env.updateLocation
             : undefined, pageField, perPageField);
-        this.getData(undefined, undefined, undefined, forceReload);
+        this.getData(undefined, undefined, forceReload);
     };
     CRUD2.prototype.reload = function (subpath, query) {
         if (query) {
             return this.receive(query);
         }
         else {
-            this.getData(undefined, undefined, true, true);
+            this.getData(undefined, undefined, true);
         }
     };
     CRUD2.prototype.receive = function (values) {
@@ -537,11 +559,12 @@ var CRUD2 = /** @class */ (function (_super) {
             onQuery: this.handleQuerySearch
             // onAction: onAction
         };
-        return render(region, schema, __assign(__assign(__assign({}, props), { 
+        return render(region, schema, __assign(__assign({ 
             // 包两层，主要是为了处理以下 case
             // 里面放了个 form，form 提交过来的时候不希望把 items 这些发送过来。
             // 因为会把数据呈现在地址栏上。
-            data: createObject(createObject(store.filterData, store.getData(this.props.data)), {}), render: this.renderChild }), childProps));
+            /** data 可以被覆盖，因为 filter 中不需要额外的 data */
+            data: createObject(createObject(store.filterData, store.getData(this.props.data)), {}) }, props), childProps));
     };
     CRUD2.prototype.renderToolbar = function (region, toolbar) {
         var _this = this;
@@ -562,14 +585,21 @@ 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
+                    });
+                }
             });
         });
     };
     CRUD2.prototype.renderSelection = function () {
         var _this = this;
-        var _a = this.props, store = _a.store, cx = _a.classnames, labelField = _a.labelField, labelTpl = _a.labelTpl, primaryField = _a.primaryField, __ = _a.translate;
+        var _a = this.props, store = _a.store, cx = _a.classnames, labelField = _a.labelField, labelTpl = _a.labelTpl, primaryField = _a.primaryField, __ = _a.translate, env = _a.env;
         if (!store.selectedItems.length) {
             return null;
         }
@@ -577,12 +607,14 @@ var CRUD2 = /** @class */ (function (_super) {
             React.createElement("div", { className: cx('Crud-selectionLabel') }, __('CRUD.selected', { total: store.selectedItems.length })),
             store.selectedItems.map(function (item, index) { return (React.createElement("div", { key: index, className: cx("Crud-value") },
                 React.createElement("span", { "data-tooltip": __('delete'), "data-position": "bottom", className: cx('Crud-valueIcon'), onClick: _this.unSelectItem.bind(_this, item, index) }, "\u00D7"),
-                React.createElement("span", { className: cx('Crud-valueLabel') }, labelTpl ? (React.createElement(Html, { html: filter(labelTpl, item) })) : (getVariable(item, labelField || 'label') ||
+                React.createElement("span", { className: cx('Crud-valueLabel') }, labelTpl ? (React.createElement(Html, { html: filter(labelTpl, item), filterHtml: env.filterHtml })) : (getVariable(item, labelField || 'label') ||
                     getVariable(item, primaryField || 'id'))))); }),
-            React.createElement("a", { onClick: this.clearSelection, className: cx('Crud-selectionClear') }, __('clear'))));
+            React.createElement("a", { onClick: this.clearSelection.bind(this), className: cx('Crud-selectionClear') }, __('clear'))));
     };
     CRUD2.prototype.render = function () {
-        var _a = this.props, columns = _a.columns, className = _a.className, style = _a.style, 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; _a.valueField; var 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 = __rest(_a, ["columns", "className", "style", "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, style = _a.style, 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; _a.valueField; var primaryField = _a.primaryField; _a.value; _a.hideQuickSaveBtn; var itemActions = _a.itemActions, cx = _a.classnames, keepItemSelectionOnPageChange = _a.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _a.maxKeepItemSelectionLength, onEvent = _a.onEvent; _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; 
+        // columnsTogglable 在本渲染器中渲染，不需要 table 渲染，避免重复
+        _a.columnsTogglable; var rest = __rest(_a, ["columns", "className", "style", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "selectable", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onEvent", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "showSelection", "headerToolbar", "footerToolbar", "columnsTogglable"]);
         return (React.createElement("div", { className: cx('Crud2', className, {
                 'is-loading': store.loading
             }), style: style },
@@ -591,7 +623,10 @@ var CRUD2 = /** @class */ (function (_super) {
             showSelection && keepItemSelectionOnPageChange && multiple !== false
                 ? this.renderSelection()
                 : null,
-            render('body', __assign(__assign({}, rest), { type: mode, columns: mode.startsWith('table')
+            render('body', __assign(__assign({}, rest), { 
+                // 通用事件 例如cus-event 如果直接透传给table 则会被触发2次
+                // 因此只将下层组件table、cards中自定义事件透传下去 否则通过crud配置了也不会执行
+                onEvent: omitBy(onEvent, function (event, key) { return !INNER_EVENTS.includes(key); }), type: mode, columns: mode.startsWith('table')
                     ? store.columns || columns
                     : undefined }), {
                 key: 'body',

package/esm/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/esm/renderers/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

package/esm/renderers/Card.d.ts

@@ -7,7 +7,7 @@ import { TableCell } from './Table';
 import { SchemaCopyable } from './Copyable';
 import { BaseSchema, SchemaClassName, SchemaExpression, SchemaObject, SchemaTpl, SchemaUrlPath } from '../Schema';
 import { ActionSchema } from './Action';
-import type { IItem } from 'amis-core/lib/store/list';
+import type { IItem } from 'amis-core';
 export type CardBodyField = SchemaObject & {
     /**
      * 列标题
@@ -36,7 +36,7 @@ export type CardBodyField = SchemaObject & {
 };
 /**
  * Card 卡片渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/card
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/card
  */
 export interface CardSchema extends BaseSchema {
     /**
@@ -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/esm/renderers/Card.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
 import { __extends, __assign, __rest, __decorate, __metadata, __spreadArray, __read } from 'tslib';
 import React from 'react';
 import omit from 'lodash/omit';
-import { filter, evalExpression, noop, padArr, isVisible, isDisabled, resolveVariable, hashCode, resolveVariableAndFilter, Renderer } from 'amis-core';
+import { filter, evalExpression, padArr, isVisible, isDisabled, resolveVariable, hashCode, resolveVariableAndFilter, Renderer } from 'amis-core';
 import { Checkbox, Icon, Card } from 'amis-ui';
 import { HocQuickEdit } from './QuickEdit.js';
 import { HocPopOver } from './PopOver.js';
@@ -31,7 +31,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(filter(href, data), {
                 type: 'button',
@@ -44,13 +44,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);
     };
@@ -63,7 +68,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;
@@ -74,7 +79,7 @@ var CardRenderer = /** @class */ (function (_super) {
             }
         }
         if (selectable && !hideCheckToggler) {
-            toolbars.push(React.createElement(Checkbox, { key: "check", className: cx('Card-checkbox'), type: multiple ? 'checkbox' : 'radio', disabled: !checkable, checked: selected, onChange: checkOnItemClick ? noop : this.handleCheck }));
+            toolbars.push(React.createElement(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) {

package/esm/renderers/Card2.d.ts

@@ -3,7 +3,7 @@ import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaClassName, SchemaCollection } from '../Schema';
 /**
  * Card2 新卡片渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/card2
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/card2
  */
 export interface Card2Schema extends BaseSchema {
     /**

package/esm/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

package/esm/renderers/Cards.d.ts

@@ -8,10 +8,10 @@ import Sortable from 'sortablejs';
 import { BaseSchema, SchemaClassName, SchemaCollection, SchemaExpression, SchemaTpl, SchemaTokenizeableString } from '../Schema';
 import { CardSchema } from './Card';
 import { Card2Schema } from './Card2';
-import type { IItem } from 'amis-core/lib/store/list';
+import type { IItem } from 'amis-core';
 /**
  * Cards 卡片集合渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/card
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/card
  */
 export interface CardsSchema extends BaseSchema, SpinnerExtraProps {
     /**
@@ -98,8 +98,8 @@ export interface Column {
     type: string;
     [propName: string]: any;
 }
-export type CardsRendererEvent = 'change';
-export type CardsRendererAction = 'check-all';
+export type CardsRendererEvent = 'selected';
+export type CardsRendererAction = 'toggleSelectAll' | 'selectAll' | 'clearAll';
 export interface GridProps extends RendererProps, Omit<CardsSchema, 'className' | 'itemClassName'> {
     store: IListStore;
     selectable?: boolean;

package/esm/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */