amis 2.9.0 → 3.0.0

package/esm/Schema.d.ts

@@ -114,7 +114,7 @@ import { UserSelectControlSchema } from './renderers/Form/UserSelect';
 import { JSONSchemaEditorControlSchema } from './renderers/Form/JSONSchemaEditor';
 import { TableSchema2 } from './renderers/Table2';
 import { BaseSchemaWithoutType, FormBaseControl, FormOptionsControl, SchemaClassName, SchemaExpression } from 'amis-core';
-import type { FormSchemaBase } from 'amis-core/lib/renderers/Form';
+import type { FormSchemaBase } from 'amis-core';
 import { MultilineTextSchema } from './renderers/MultilineText';
 import { DateRangeSchema } from './renderers/DateRange';
 import { PasswordSchema } from './renderers/Password';
@@ -251,7 +251,7 @@ export type SchemaRedirect = string;
  * 2. `<%= data.xxx %>`
  *
  *
- * 更多文档：https://baidu.gitee.io/amis/docs/concepts/template
+ * 更多文档：https://aisuda.bce.baidu.com/amis/zh-CN/docs/concepts/template
  */
 export type SchemaTpl = string;
 /**
@@ -411,7 +411,7 @@ export interface ToastSchemaBase extends BaseSchema {
 /**
  * Form 表单渲染器。
  *
- * 说明：https://baidu.gitee.io/amis/docs/components/form/index
+ * 说明：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/index
  */
 export interface FormSchema extends FormSchemaBase, BaseSchema {
     /**

package/esm/compat.js

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

package/esm/index.d.ts

@@ -150,5 +150,14 @@ import './renderers/MultilineText';
 import './renderers/OfficeViewer';
 import './compat';
 import './schemaExtend';
+import type { BaseSchema, FormSchema, SchemaApi, SchemaCollection, SchemaExpression, SchemaObject } from './Schema';
+import type { TableViewSchema, TrObject } from './renderers/TableView';
+import type { ActionSchema, ButtonSchema } from './renderers/Action';
+import type { CRUDCommonSchema } from './renderers/CRUD';
+import type { CRUD2Schema } from './renderers/CRUD2';
+import type { TabsSchema } from './renderers/Tabs';
+import { availableLanguages as EditorAvailableLanguages } from './renderers/Form/Editor';
+import type { Action } from './types';
 export * from './renderers/Form/IconPickerIcons';
 export * from './renderers/Form/IconSelectStore';
+export { BaseSchema, SchemaCollection, FormSchema, SchemaApi, SchemaObject, TableViewSchema, TrObject, ActionSchema, CRUDCommonSchema, ButtonSchema, CRUD2Schema, TabsSchema, SchemaExpression, Action, EditorAvailableLanguages };

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -70,7 +70,7 @@ import './renderers/Form/ConditionBuilder.js';
 import './renderers/Form/InputSubForm.js';
 import './renderers/Form/InputExcel.js';
 import './renderers/Form/InputRichText.js';
-import './renderers/Form/Editor.js';
+export { availableLanguages as EditorAvailableLanguages } from './renderers/Form/Editor.js';
 import './renderers/Form/DiffEditor.js';
 import './renderers/Form/InputColor.js';
 import './renderers/Form/ChainedSelect.js';

package/esm/preset.js

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

package/esm/renderers/Action.d.ts

@@ -169,7 +169,7 @@ export interface DialogActionSchema extends ButtonSchema {
     actionType: 'dialog';
     /**
      * 弹框详情
-     * 文档：https://baidu.gitee.io/amis/docs/components/dialog
+     * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/dialog
      */
     dialog: DialogSchemaBase;
     /**
@@ -186,7 +186,7 @@ export interface DrawerActionSchema extends ButtonSchema {
     actionType: 'drawer';
     /**
      * 抽出式弹框详情
-     * 文档：https://baidu.gitee.io/amis/docs/components/drawer
+     * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/drawer
      */
     drawer: DrawerSchemaBase;
     /**
@@ -203,7 +203,7 @@ export interface ToastActionSchema extends ButtonSchema {
     actionType: 'toast';
     /**
      * 轻提示详情
-     * 文档：https://baidu.gitee.io/amis/docs/components/toast
+     * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/toast
      */
     toast: ToastSchemaBase;
 }
@@ -272,7 +272,7 @@ export interface VanillaAction extends ButtonSchema {
 }
 /**
  * 按钮动作渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/action
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/action
  */
 export type ActionSchema = AjaxActionSchema | UrlActionSchema | LinkActionSchema | DialogActionSchema | DrawerActionSchema | ToastActionSchema | CopyActionSchema | ReloadActionSchema | EmailActionSchema | OtherActionSchema | VanillaAction;
 import { ThemeProps } from 'amis-core';

package/esm/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -233,8 +233,8 @@ var Action = /** @class */ (function (_super) {
     };
     Action.prototype.render = function () {
         var _a;
-        var _b = this.props, type = _b.type, icon = _b.icon, iconClassName = _b.iconClassName, rightIcon = _b.rightIcon, rightIconClassName = _b.rightIconClassName, loadingClassName = _b.loadingClassName, primary = _b.primary, size = _b.size, level = _b.level, countDownTpl = _b.countDownTpl, block = _b.block, className = _b.className, style = _b.style, componentClass = _b.componentClass, tooltip = _b.tooltip, disabledTip = _b.disabledTip, tooltipPlacement = _b.tooltipPlacement, actionType = _b.actionType, link = _b.link, data = _b.data, __ = _b.translate, activeClassName = _b.activeClassName, isCurrentUrl = _b.isCurrentUrl, isMenuItem = _b.isMenuItem, active = _b.active, activeLevel = _b.activeLevel, tooltipTrigger = _b.tooltipTrigger, tooltipContainer = _b.tooltipContainer, tooltipRootClose = _b.tooltipRootClose, loading = _b.loading, body = _b.body, render = _b.render, onMouseEnter = _b.onMouseEnter, onMouseLeave = _b.onMouseLeave, cx = _b.classnames, ns = _b.classPrefix, loadingConfig = _b.loadingConfig, css = _b.css, id = _b.id;
-        insertCustomStyle(css, [
+        var _b = this.props, type = _b.type, icon = _b.icon, iconClassName = _b.iconClassName, rightIcon = _b.rightIcon, rightIconClassName = _b.rightIconClassName, loadingClassName = _b.loadingClassName, primary = _b.primary, size = _b.size, level = _b.level, countDownTpl = _b.countDownTpl, block = _b.block, className = _b.className, style = _b.style, componentClass = _b.componentClass, tooltip = _b.tooltip, disabledTip = _b.disabledTip, tooltipPlacement = _b.tooltipPlacement, actionType = _b.actionType, link = _b.link, data = _b.data, __ = _b.translate, activeClassName = _b.activeClassName, isCurrentUrl = _b.isCurrentUrl, isMenuItem = _b.isMenuItem, active = _b.active, activeLevel = _b.activeLevel, tooltipTrigger = _b.tooltipTrigger, tooltipContainer = _b.tooltipContainer, tooltipRootClose = _b.tooltipRootClose, loading = _b.loading, body = _b.body, render = _b.render, onMouseEnter = _b.onMouseEnter, onMouseLeave = _b.onMouseLeave, cx = _b.classnames, ns = _b.classPrefix, loadingConfig = _b.loadingConfig, themeCss = _b.themeCss, css = _b.css, id = _b.id;
+        insertCustomStyle(themeCss || css, [
             {
                 key: 'className',
                 value: className,
@@ -348,7 +348,8 @@ var ActionRenderer = /** @class */ (function (_super) {
                     case 1:
                         confirmed = _b.sent();
                         if (!confirmed) return [3 /*break*/, 3];
-                        return [4 /*yield*/, dispatchEvent(e, mergedData)];
+                        return [4 /*yield*/, dispatchEvent(e, mergedData, this // 保证renderer可以拿到，避免因交互设计导致的清空情况，例如crud内itemAction
+                            )];
                     case 2:
                         rendererEvent = _b.sent();
                         // 阻止原有动作执行

package/esm/renderers/Alert.d.ts

@@ -4,7 +4,7 @@ import { BaseSchema, SchemaCollection, SchemaIcon } from '../Schema';
 import type { AlertProps } from 'amis-ui/lib/components/Alert2';
 /**
  * Alert 提示渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/alert
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/alert
  */
 export interface AlertSchema extends BaseSchema {
     /**

package/esm/renderers/Alert.js

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

package/esm/renderers/AnchorNav.d.ts

@@ -3,7 +3,7 @@ import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaClassName, SchemaCollection } from '../Schema';
 /**
  * AnchorNavSection 锚点区域渲染器
- * 文档：https://baidu.gitee.io/amis/docs/components/anchor-nav
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/anchor-nav
  */
 export type AnchorNavSectionSchema = {
     /**
@@ -21,7 +21,7 @@ export type AnchorNavSectionSchema = {
 } & Omit<BaseSchema, 'type'>;
 /**
  * AnchorNav 锚点导航渲染器
- * 文档：https://baidu.gitee.io/amis/docs/components/anchor-nav
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/anchor-nav
  */
 export interface AnchorNavSchema extends BaseSchema {
     /**

package/esm/renderers/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -53,13 +53,15 @@ var AnchorNav = /** @class */ (function (_super) {
         }
         links = Array.isArray(links) ? links : [links];
         var children = [];
-        children = links.map(function (section, index) {
+        children = links
+            .map(function (section, index) {
             return isVisible(section, data) ? (React.createElement(AnchorNavSection, __assign({}, section, { title: filter(section.title, data), key: index, name: section.href || index }), _this.renderSection
                 ? _this.renderSection(section, _this.props, index)
                 : sectionRender
                     ? sectionRender(section, _this.props, index)
                     : render("section/".concat(index), section.body || ''))) : null;
-        }).filter(function (item) { return !!item; });
+        })
+            .filter(function (item) { return !!item; });
         return (React.createElement(AnchorNav$1, { classPrefix: ns, classnames: cx, className: className, style: style, linkClassName: linkClassName, sectionClassName: sectionClassName, onSelect: this.handleSelect, active: this.state.active, direction: direction }, children));
     };
     AnchorNav.defaultProps = {

package/esm/renderers/App.d.ts

@@ -53,7 +53,7 @@ export interface AppPage extends SpinnerExtraProps {
 }
 /**
  * App 渲染器，适合 JSSDK 用来做多页渲染。
- * 文档：https://baidu.gitee.io/amis/docs/components/app
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/app
  */
 export interface AppSchema extends BaseSchema, SpinnerExtraProps {
     /**

package/esm/renderers/App.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -117,13 +117,13 @@ var App = /** @class */ (function (_super) {
         env.jumpTo(link);
     };
     App.prototype.renderHeader = function () {
-        var _a = this.props, cx = _a.classnames, brandName = _a.brandName, header = _a.header, render = _a.render, store = _a.store, logo = _a.logo;
+        var _a = this.props, cx = _a.classnames, brandName = _a.brandName, header = _a.header, render = _a.render, store = _a.store, logo = _a.logo, env = _a.env;
         return (React.createElement(React.Fragment, null,
             React.createElement("div", { className: cx('Layout-brandBar') },
                 React.createElement("div", { onClick: store.toggleOffScreen, className: cx('Layout-offScreenBtn') },
                     React.createElement("i", { className: "bui-icon iconfont icon-collapse" })),
                 React.createElement("div", { className: cx('Layout-brand') },
-                    logo && ~logo.indexOf('<svg') ? (React.createElement(Html, { className: cx('AppLogo-html'), html: logo })) : logo ? (React.createElement("img", { className: cx('AppLogo'), src: logo })) : null,
+                    logo && ~logo.indexOf('<svg') ? (React.createElement(Html, { className: cx('AppLogo-html'), html: logo, filterHtml: env.filterHtml })) : logo ? (React.createElement("img", { className: cx('AppLogo'), src: logo })) : null,
                     React.createElement("span", { className: "hidden-folded m-l-sm" }, brandName))),
             React.createElement("div", { className: cx('Layout-headerBar') },
                 React.createElement("a", { onClick: store.toggleFolded, type: "button", className: cx('AppFoldBtn') },

package/esm/renderers/Audio.d.ts

@@ -3,7 +3,7 @@ import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaUrlPath } from '../Schema';
 /**
  * Audio 音频渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/audio
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/audio
  */
 export interface AudioSchema extends BaseSchema {
     /**

package/esm/renderers/Audio.js

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

package/esm/renderers/Avatar.js

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

package/esm/renderers/BarCode.d.ts

@@ -6,7 +6,7 @@ import { RendererProps } from 'amis-core';
 import { BaseSchema } from '../Schema';
 /**
  * BarCode 显示渲染器，格式说明。
- * 文档：https://baidu.gitee.io/amis/docs/components/barcode
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/barcode
  */
 export interface BarCodeSchema extends BaseSchema {
     /**

package/esm/renderers/BarCode.js

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

package/esm/renderers/Breadcrumb.d.ts

@@ -40,7 +40,7 @@ export type TooltipPositionType = 'top' | 'bottom' | 'left' | 'right';
 export type ItemPlace = 'start' | 'middle' | 'end';
 /**
  * Breadcrumb 显示渲染器
- * 文档：https://baidu.gitee.io/amis/docs/components/breadcrumb
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/breadcrumb
  */
 export interface BreadcrumbSchema extends BaseSchema {
     /**

package/esm/renderers/Breadcrumb.js

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

package/esm/renderers/ButtonGroup.d.ts

@@ -3,7 +3,7 @@ import { BaseSchema, SchemaClassName, SchemaExpression } from '../Schema';
 import { ActionSchema } from './Action';
 /**
  * Button Group 渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/button-group
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/button-group
  */
 export interface ButtonGroupSchema extends BaseSchema {
     /**

package/esm/renderers/ButtonGroup.js

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

package/esm/renderers/CRUD.d.ts

@@ -9,6 +9,8 @@ import { ActionSchema } from './Action';
 import { CardsSchema } from './Cards';
 import { ListSchema } from './List';
 import { TableSchema } from './Table';
+import type { TableRendererEvent } from './Table';
+import type { CardsRendererEvent } from './Cards';
 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 Omit<BaseSchema, 'type'> {
     type: CRUDBultinToolbarType;
@@ -20,6 +22,17 @@ export type CRUDToolbarObject = {
      */
     align?: 'left' | 'right';
 };
+export type AutoGenerateFilterObject = {
+    /**
+     * 过滤条件单行列数
+     */
+    columnsNum?: number;
+    /**
+     * 是否显示设置查询字段
+     */
+    showBtnToolbar?: boolean;
+};
+export type CRUDRendererEvent = TableRendererEvent | CardsRendererEvent;
 export interface CRUDCommonSchema extends BaseSchema, SpinnerExtraProps {
     /**
      *  指定为 CRUD 渲染器。
@@ -198,7 +211,7 @@ export interface CRUDCommonSchema extends BaseSchema, SpinnerExtraProps {
     /**
      * 开启查询区域，会根据列元素的searchable属性值，自动生成查询条件表单
      */
-    autoGenerateFilter?: boolean;
+    autoGenerateFilter?: AutoGenerateFilterObject | boolean;
     /**
      * 内容区域占满屏幕剩余空间
      */
@@ -215,7 +228,7 @@ export type CRUDTableSchema = CRUDCommonSchema & {
 } & Omit<TableSchema, 'type'>;
 /**
  * CRUD 增删改查渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/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 {

package/esm/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.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) {
@@ -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; _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"]);
+        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,

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 渲染器。