amis 2.8.0 → 3.0.0

package/lib/index.d.ts

@@ -123,6 +123,7 @@ import './renderers/SparkLine';
 import './renderers/Video';
 import './renderers/Audio';
 import './renderers/Nav';
+import './renderers/Number';
 import './renderers/Tasks';
 import './renderers/Drawer';
 import './renderers/Wrapper';
@@ -146,7 +147,17 @@ import './renderers/Words';
 import './renderers/Password';
 import './renderers/DateRange';
 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/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -74,7 +74,7 @@ require('./renderers/Form/ConditionBuilder.js');
 require('./renderers/Form/InputSubForm.js');
 require('./renderers/Form/InputExcel.js');
 require('./renderers/Form/InputRichText.js');
-require('./renderers/Form/Editor.js');
+var Editor = require('./renderers/Form/Editor.js');
 require('./renderers/Form/DiffEditor.js');
 require('./renderers/Form/InputColor.js');
 require('./renderers/Form/ChainedSelect.js');
@@ -125,6 +125,7 @@ require('./renderers/SparkLine.js');
 require('./renderers/Video.js');
 require('./renderers/Audio.js');
 require('./renderers/Nav.js');
+require('./renderers/Number.js');
 require('./renderers/Tasks.js');
 require('./renderers/Drawer.js');
 require('./renderers/Wrapper.js');
@@ -148,6 +149,7 @@ require('./renderers/Words.js');
 require('./renderers/Password.js');
 require('./renderers/DateRange.js');
 require('./renderers/MultilineText.js');
+require('./renderers/OfficeViewer.js');
 require('./compat.js');
 require('./schemaExtend.js');
 var IconPickerIcons = require('./renderers/Form/IconPickerIcons.js');
@@ -155,6 +157,7 @@ var IconSelectStore = require('./renderers/Form/IconSelectStore.js');
 
 
 
+exports.EditorAvailableLanguages = Editor.availableLanguages;
 Object.defineProperty(exports, 'ICONS', {
 	enumerable: true,
 	get: function () { return IconPickerIcons.ICONS; }

package/lib/preset.js

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

package/lib/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';
@@ -287,7 +287,7 @@ export interface ActionProps extends Omit<ButtonSchema, 'className' | 'iconClass
     onActionSensor?: (promise?: Promise<any>) => void;
     isCurrentUrl?: (link: string) => boolean;
     onClick?: ((e: React.MouseEvent<any>, props: any) => void) | string | Function | null;
-    componentClass: React.ReactType;
+    componentClass: React.ElementType;
     tooltipContainer?: any;
     data?: any;
     isMenuItem?: boolean;
@@ -301,7 +301,7 @@ interface ActionState {
 export declare class Action extends React.Component<ActionProps, ActionState> {
     static defaultProps: {
         type: "button";
-        componentClass: React.ReactType<any>;
+        componentClass: React.ElementType<any>;
         tooltipPlacement: "bottom";
         activeClassName: string;
         countDownTpl: string;
@@ -326,15 +326,10 @@ declare const _default: {
          * 倒计时文字自定义
          */
         render(): JSX.Element;
-        context: any;
-        /**
-         * 角标
-         */
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/lib/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -244,8 +244,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;
-        amisCore.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;
+        amisCore.insertCustomStyle(themeCss || css, [
             {
                 key: 'className',
                 value: className,
@@ -359,7 +359,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/lib/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/lib/renderers/Alert.js

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

package/lib/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/lib/renderers/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -62,13 +62,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 amisCore.isVisible(section, data) ? (React__default["default"].createElement(amisUi.AnchorNavSection, tslib.__assign({}, section, { title: amisCore.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__default["default"].createElement(amisUi.AnchorNav, { 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/lib/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/lib/renderers/App.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -125,13 +125,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__default["default"].createElement(React__default["default"].Fragment, null,
             React__default["default"].createElement("div", { className: cx('Layout-brandBar') },
                 React__default["default"].createElement("div", { onClick: store.toggleOffScreen, className: cx('Layout-offScreenBtn') },
                     React__default["default"].createElement("i", { className: "bui-icon iconfont icon-collapse" })),
                 React__default["default"].createElement("div", { className: cx('Layout-brand') },
-                    logo && ~logo.indexOf('<svg') ? (React__default["default"].createElement(amisUi.Html, { className: cx('AppLogo-html'), html: logo })) : logo ? (React__default["default"].createElement("img", { className: cx('AppLogo'), src: logo })) : null,
+                    logo && ~logo.indexOf('<svg') ? (React__default["default"].createElement(amisUi.Html, { className: cx('AppLogo-html'), html: logo, filterHtml: env.filterHtml })) : logo ? (React__default["default"].createElement("img", { className: cx('AppLogo'), src: logo })) : null,
                     React__default["default"].createElement("span", { className: "hidden-folded m-l-sm" }, brandName))),
             React__default["default"].createElement("div", { className: cx('Layout-headerBar') },
                 React__default["default"].createElement("a", { onClick: store.toggleFolded, type: "button", className: cx('AppFoldBtn') },

package/lib/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/lib/renderers/Audio.js

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

package/lib/renderers/Avatar.js

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

package/lib/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/lib/renderers/BarCode.js

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

package/lib/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/lib/renderers/Breadcrumb.js

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

package/lib/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/lib/renderers/ButtonGroup.js

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

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

package/lib/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var React = require('react');
 var isEqual = require('lodash/isEqual');
 var pickBy = require('lodash/pickBy');
+var omitBy = require('lodash/omitBy');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var pick = require('lodash/pick');
@@ -24,11 +25,24 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var pickBy__default = /*#__PURE__*/_interopDefaultLegacy(pickBy);
+var omitBy__default = /*#__PURE__*/_interopDefaultLegacy(omitBy);
 var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 var findIndex__default = /*#__PURE__*/_interopDefaultLegacy(findIndex);
 
+var INNER_EVENTS = [
+    'selectedChange',
+    'columnSort',
+    'columnFilter',
+    'columnSearch',
+    'columnToggled',
+    'orderChange',
+    'rowClick',
+    'rowMouseEnter',
+    'rowMouseLeave',
+    'selected'
+];
 var CRUD = /** @class */ (function (_super) {
     tslib.__extends(CRUD, _super);
     function CRUD(props) {
@@ -208,7 +222,7 @@ var CRUD = /** @class */ (function (_super) {
                             redirect = action.redirect && amisCore.filter(action.redirect, data);
                             redirect && !action.blank && env.jumpTo(redirect, action);
                             action.reload
-                                ? this.reloadTarget(action.reload, data)
+                                ? this.reloadTarget(amisCore.filter(action.reload, data), data)
                                 : redirect
                                     ? null
                                     : this.search(undefined, undefined, true, true);
@@ -286,7 +300,7 @@ var CRUD = /** @class */ (function (_super) {
                                     _b.label = 2;
                                 case 2:
                                     action.reload
-                                        ? this.reloadTarget(action.reload, data)
+                                        ? this.reloadTarget(amisCore.filter(action.reload, data), data)
                                         : this.search((_a = {}, _a[pageField || 'page'] = 1, _a), undefined, true, true);
                                     action.close && this.closeTarget(action.close);
                                     redirect = action.redirect && amisCore.filter(action.redirect, data);
@@ -426,7 +440,7 @@ var CRUD = /** @class */ (function (_super) {
         }
         var reload = (_c = action.reload) !== null && _c !== void 0 ? _c : dialogAction.reload;
         if (reload) {
-            this.reloadTarget(reload, ctx);
+            this.reloadTarget(amisCore.filter(reload, ctx), ctx);
         }
         var redirect = (_d = action.redirect) !== null && _d !== void 0 ? _d : dialogAction.redirect;
         redirect = redirect && amisCore.filter(redirect, ctx);
@@ -569,7 +583,7 @@ var CRUD = /** @class */ (function (_super) {
                 var _a;
                 var finalReload = (_a = options === null || options === void 0 ? void 0 : options.reload) !== null && _a !== void 0 ? _a : reload;
                 finalReload
-                    ? _this.reloadTarget(finalReload, data_1)
+                    ? _this.reloadTarget(amisCore.filter(finalReload, data_1), data_1)
                     : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -591,7 +605,7 @@ var CRUD = /** @class */ (function (_super) {
                 var _a;
                 var finalReload = (_a = options === null || options === void 0 ? void 0 : options.reload) !== null && _a !== void 0 ? _a : reload;
                 finalReload
-                    ? _this.reloadTarget(finalReload, data_2)
+                    ? _this.reloadTarget(amisCore.filter(finalReload, data_2), data_2)
                     : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () {
@@ -678,7 +692,7 @@ var CRUD = /** @class */ (function (_super) {
             store
                 .saveRemote(saveOrderApi, model)
                 .then(function () {
-                reload && _this.reloadTarget(reload, model);
+                reload && _this.reloadTarget(amisCore.filter(reload, model), model);
                 _this.search(undefined, undefined, true, true);
             })
                 .catch(function () { });
@@ -838,7 +852,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;
         }
@@ -847,9 +862,19 @@ var CRUD = /** @class */ (function (_super) {
         var bulkBtns = [];
         var itemBtns = [];
         var ctx = amisCore.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,
@@ -906,6 +931,8 @@ var CRUD = /** @class */ (function (_super) {
             extraProps.maxButtons = toolbar.maxButtons;
             extraProps.layout = toolbar.layout;
             extraProps.popOverContainerSelector = toolbar.popOverContainerSelector;
+            extraProps.perPageAvailable = toolbar.perPageAvailable;
+            extraProps.total = amisCore.resolveVariableAndFilter(toolbar.total, store.data);
         }
         else {
             extraProps.showPageInput = lastPage > 9;
@@ -1053,8 +1080,8 @@ var CRUD = /** @class */ (function (_super) {
             // 因为会把数据呈现在地址栏上。
             data: amisCore.createObject(amisCore.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,
@@ -1103,7 +1130,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;
         }
@@ -1111,13 +1138,13 @@ var CRUD = /** @class */ (function (_super) {
             React__default["default"].createElement("div", { className: cx('Crud-selectionLabel') }, __('CRUD.selected', { total: store.selectedItems.length })),
             store.selectedItems.map(function (item, index) { return (React__default["default"].createElement("div", { key: index, className: cx("Crud-value") },
                 React__default["default"].createElement("span", { "data-tooltip": __('delete'), "data-position": "bottom", className: cx('Crud-valueIcon'), onClick: _this.unSelectItem.bind(_this, item, index) }, "\u00D7"),
-                React__default["default"].createElement("span", { className: cx('Crud-valueLabel') }, labelTpl ? (React__default["default"].createElement(amisUi.Html, { html: amisCore.filter(labelTpl, item) })) : (amisCore.getVariable(item, labelField || 'label') ||
+                React__default["default"].createElement("span", { className: cx('Crud-valueLabel') }, labelTpl ? (React__default["default"].createElement(amisUi.Html, { html: amisCore.filter(labelTpl, item), filterHtml: env.filterHtml })) : (amisCore.getVariable(item, labelField || 'label') ||
                     amisCore.getVariable(item, primaryField || 'id'))))); }),
             React__default["default"].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 = tslib.__rest(_b, ["className", "style", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "onEvent"]);
+        var _b = this.props, className = _b.className, style = _b.style, bodyClassName = _b.bodyClassName, filter = _b.filter, render = _b.render, store = _b.store, mode = _b.mode; _b.syncLocation; _b.children; var bulkActions = _b.bulkActions, pickerMode = _b.pickerMode, multiple = _b.multiple, valueField = _b.valueField, primaryField = _b.primaryField; _b.value; var hideQuickSaveBtn = _b.hideQuickSaveBtn, itemActions = _b.itemActions, cx = _b.classnames, keepItemSelectionOnPageChange = _b.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _b.maxKeepItemSelectionLength; _b.onAction; var popOverContainer = _b.popOverContainer, __ = _b.translate; _b.onQuery; var autoGenerateFilter = _b.autoGenerateFilter; _b.onSelect; var autoFillHeight = _b.autoFillHeight, onEvent = _b.onEvent; _b.onSave; _b.onSaveOrder; _b.onPopOverOpened; _b.onPopOverClosed; _b.onSearchableFromReset; _b.onSearchableFromSubmit; _b.onSearchableFromInit; _b.headerToolbarRender; _b.footerToolbarRender; var rest = tslib.__rest(_b, ["className", "style", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "onEvent", "onSave", "onSaveOrder", "onPopOverOpened", "onPopOverClosed", "onSearchableFromReset", "onSearchableFromSubmit", "onSearchableFromInit", "headerToolbarRender", "footerToolbarRender"]);
         return (React__default["default"].createElement("div", { className: cx('Crud', className, {
                 'is-loading': store.loading
             }), style: style },
@@ -1135,7 +1162,10 @@ var CRUD = /** @class */ (function (_super) {
             keepItemSelectionOnPageChange && multiple !== false
                 ? this.renderSelection()
                 : null,
-            render('body', tslib.__assign(tslib.__assign({}, rest), { columns: (_a = store.columns) !== null && _a !== void 0 ? _a : rest.columns, type: mode || 'table' }), {
+            render('body', tslib.__assign(tslib.__assign({}, rest), { 
+                // 通用事件 例如cus-event 如果直接透传给table 则会被触发2次
+                // 因此只将下层组件table、cards中自定义事件透传下去 否则通过crud配置了也不会执行
+                onEvent: omitBy__default["default"](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,
@@ -1236,6 +1266,7 @@ var CRUD = /** @class */ (function (_super) {
         'onChange',
         'onInit',
         'onSaved',
+        'onSave',
         'onQuery',
         'formStore',
         'autoFillHeight'