amis 2.9.0 → 3.0.0

package/lib/renderers/SearchBox.d.ts

@@ -9,7 +9,7 @@ export interface SearchBoxSchema extends BaseSchema {
     /**
      * 指定为搜索框。
      *
-     * 文档：https://baidu.gitee.io/amis/docs/components/search-box
+     * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/search-box
      */
     type: 'search-box';
     /**

package/lib/renderers/SearchBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -39,7 +39,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
                         this.setState({ value: value });
                         return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, {
                                 value: value
-                            }, 'value'))];
+                            }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -84,7 +84,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
     };
     SearchBoxRenderer.prototype.dispatchEvent = function (name) {
         var dispatchEvent = this.props.dispatchEvent;
-        dispatchEvent(name, amisCore.resolveEventData(this.props, { value: this.state.value }, 'value'));
+        dispatchEvent(name, amisCore.resolveEventData(this.props, { value: this.state.value }));
     };
     SearchBoxRenderer.prototype.doAction = function (action, args) {
         var actionType = action === null || action === void 0 ? void 0 : action.actionType;

package/lib/renderers/Service.d.ts

@@ -13,7 +13,7 @@ export type DataProvider = string | Function;
 export type ComposedDataProvider = DataProvider | DataProviderCollection;
 /**
  * Service 服务类控件。
- * 文档：https://baidu.gitee.io/amis/docs/components/service
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/service
  */
 export interface ServiceSchema extends BaseSchema, SpinnerExtraProps {
     /**

package/lib/renderers/Service.js

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

package/lib/renderers/SparkLine.js

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

package/lib/renderers/Spinner.js

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

package/lib/renderers/Status.d.ts

@@ -11,7 +11,7 @@ export interface StatusSource {
 }
 /**
  * 状态展示控件。
- * 文档：https://baidu.gitee.io/amis/docs/components/status
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/status
  */
 export interface StatusSchema extends BaseSchema {
     /**

package/lib/renderers/Status.js

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

package/lib/renderers/Steps.js

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

package/lib/renderers/Table/ColumnToggler.d.ts

@@ -2,8 +2,8 @@ import React from 'react';
 import Sortable from 'sortablejs';
 import { RendererProps } from 'amis-core';
 import type { TooltipObject } from 'amis-ui/lib/components/TooltipWrapper';
-import { IColumn } from 'amis-core/lib/store/table';
-import type { IColumn2 } from 'amis-core/lib/store/table2';
+import { IColumn } from 'amis-core';
+import type { IColumn2 } from 'amis-core';
 export interface ColumnTogglerProps extends RendererProps {
     /**
      * 按钮文字

package/lib/renderers/Table/ColumnToggler.js

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

package/lib/renderers/Table/HeadCellFilterDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -50,6 +50,7 @@ var HeadCellFilterDropDown = /** @class */ (function (_super) {
         var _a, _b, _c, _d;
         var name = this.props.name;
         var props = this.props;
+        this.sourceInvalid = false;
         if (prevProps.name !== props.name ||
             prevProps.filterable !== props.filterable ||
             prevProps.data !== props.data) {

package/lib/renderers/Table/HeadCellSearchDropdown.js

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

package/lib/renderers/Table/ItemActionsWrapper.js

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

package/lib/renderers/Table/TableBody.d.ts

@@ -3,7 +3,7 @@ import { ClassNamesFn } from 'amis-core';
 import { SchemaNode, ActionObject } from 'amis-core';
 import { LocaleProps } from 'amis-core';
 import { ActionSchema } from '../Action';
-import type { IColumn, IRow } from 'amis-core/lib/store/table';
+import type { IColumn, IRow } from 'amis-core';
 export interface TableBodyProps extends LocaleProps {
     className?: string;
     rowsProps?: any;
@@ -54,7 +54,7 @@ export declare class TableBody extends React.Component<TableBodyProps> {
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number | undefined): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -80,11 +80,11 @@ export declare class TableBody extends React.Component<TableBodyProps> {
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number | undefined): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[], rowProps?: any): any;
-    renderSummaryRow(position: 'prefix' | 'affix', items?: Array<any>, rowIndex?: number): JSX.Element | null;
+    renderSummaryRow(position: 'prefix' | 'affix', items: Array<any>, rowIndex?: number): JSX.Element | null;
     renderSummary(position: 'prefix' | 'affix', items?: Array<any>): JSX.Element | (JSX.Element | null)[] | null;
     render(): JSX.Element;
 }

package/lib/renderers/Table/TableBody.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -53,28 +53,28 @@ var TableBody = /** @class */ (function (_super) {
         });
     };
     TableBody.prototype.renderSummaryRow = function (position, items, rowIndex) {
-        var _a = this.props, columns = _a.columns, render = _a.render, data = _a.data, cx = _a.classnames, rows = _a.rows, prefixRowClassName = _a.prefixRowClassName, affixRowClassName = _a.affixRowClassName;
+        var _a, _b;
+        var _c = this.props, columns = _c.columns, render = _c.render, data = _c.data, cx = _c.classnames, rows = _c.rows, prefixRowClassName = _c.prefixRowClassName, affixRowClassName = _c.affixRowClassName;
         if (!(Array.isArray(items) && items.length)) {
             return null;
         }
-        var filterColumns = columns.filter(function (item) { return item.toggable; });
-        var result = [];
-        for (var index = 0; index < filterColumns.length; index++) {
-            var item = items[filterColumns[index].rawIndex];
-            item && result.push(tslib.__assign({}, item));
-        }
+        var result = items;
         //  如果是勾选栏，让它和下一列合并。
-        if (columns[0].type === '__checkme' && result[0]) {
+        if (((_a = columns[0]) === null || _a === void 0 ? void 0 : _a.type) === '__checkme' && result[0]) {
             result[0].colSpan = (result[0].colSpan || 1) + 1;
         }
         //  如果是展开栏，让它和下一列合并。
-        if (columns[0].type === '__expandme' && result[0]) {
+        if (((_b = columns[0]) === null || _b === void 0 ? void 0 : _b.type) === '__expandme' && result[0]) {
             result[0].colSpan = (result[0].colSpan || 1) + 1;
         }
         // 缺少的单元格补齐
         var appendLen = columns.length - result.reduce(function (p, c) { return p + (c.colSpan || 1); }, 0);
         if (appendLen) {
-            var item = result.pop();
+            var item = result.length
+                ? result.pop()
+                : {
+                    type: 'plain'
+                };
             result.push(tslib.__assign(tslib.__assign({}, item), { colSpan: (item.colSpan || 1) + appendLen }));
         }
         var ctx = amisCore.createObject(data, {

package/lib/renderers/Table/TableCell.js

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

package/lib/renderers/Table/TableContent.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { ClassNamesFn, ITableStore, SchemaNode, ActionObject, LocaleProps, OnEventProps } from 'amis-core';
 import { ActionSchema } from '../Action';
 import { SchemaTpl } from '../../Schema';
-import type { IColumn, IRow } from 'amis-core/lib/store/table';
+import type { IColumn, IRow } from 'amis-core';
 export interface TableContentProps extends LocaleProps {
     className?: string;
     tableClassName?: string;

package/lib/renderers/Table/TableContent.js

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

package/lib/renderers/Table/TableRow.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { IColumn, IRow } from 'amis-core/lib/store/table';
+import type { IColumn, IRow } from 'amis-core';
 import { RendererProps } from 'amis-core';
 import { Action } from '../Action';
 interface TableRowProps extends Pick<RendererProps, 'render'> {
@@ -18,6 +18,8 @@ interface TableRowProps extends Pick<RendererProps, 'render'> {
 }
 export declare class TableRow extends React.Component<TableRowProps> {
     constructor(props: TableRowProps);
+    handleMouseEnter(e: React.MouseEvent<HTMLTableRowElement>): void;
+    handleMouseLeave(e: React.MouseEvent<HTMLTableRowElement>): void;
     handleItemClick(e: React.MouseEvent<HTMLTableRowElement>): Promise<void>;
     handleAction(e: React.UIEvent<any>, action: Action, ctx: any): void;
     handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, options?: {

package/lib/renderers/Table/TableRow.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -25,21 +25,41 @@ var TableRow = /** @class */ (function (_super) {
         _this.handleQuickChange = _this.handleQuickChange.bind(_this);
         _this.handleChange = _this.handleChange.bind(_this);
         _this.handleItemClick = _this.handleItemClick.bind(_this);
+        _this.handleMouseEnter = _this.handleMouseEnter.bind(_this);
+        _this.handleMouseLeave = _this.handleMouseLeave.bind(_this);
         return _this;
     }
+    TableRow.prototype.handleMouseEnter = function (e) {
+        var _a = this.props, item = _a.item, itemIndex = _a.itemIndex, data = _a.data, dispatchEvent = _a.dispatchEvent;
+        dispatchEvent('rowMouseEnter', amisCore.createObject(data, {
+            item: item === null || item === void 0 ? void 0 : item.data,
+            index: itemIndex
+        }));
+    };
+    TableRow.prototype.handleMouseLeave = function (e) {
+        var _a = this.props, item = _a.item, itemIndex = _a.itemIndex, data = _a.data, dispatchEvent = _a.dispatchEvent;
+        dispatchEvent('rowMouseLeave', amisCore.createObject(data, {
+            item: item === null || item === void 0 ? void 0 : item.data,
+            index: itemIndex
+        }));
+    };
     // 定义点击一行的行为，通过 itemAction配置
     TableRow.prototype.handleItemClick = function (e) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, itemAction, onAction, item, data, dispatchEvent, onCheck, rendererEvent;
+            var _a, itemAction, onAction, item, itemIndex, data, dispatchEvent, onCheck, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (amisCore.isClickOnInput(e)) {
                             return [2 /*return*/];
                         }
-                        _a = this.props, itemAction = _a.itemAction, onAction = _a.onAction, item = _a.item, data = _a.data, dispatchEvent = _a.dispatchEvent, onCheck = _a.onCheck;
+                        e.preventDefault();
+                        e.stopPropagation();
+                        _a = this.props, itemAction = _a.itemAction, onAction = _a.onAction, item = _a.item, itemIndex = _a.itemIndex, data = _a.data, dispatchEvent = _a.dispatchEvent, onCheck = _a.onCheck;
                         return [4 /*yield*/, dispatchEvent('rowClick', amisCore.createObject(data, {
-                                rowItem: item === null || item === void 0 ? void 0 : item.data
+                                rowItem: item === null || item === void 0 ? void 0 : item.data,
+                                item: item === null || item === void 0 ? void 0 : item.data,
+                                index: itemIndex
                             }))];
                     case 1:
                         rendererEvent = _b.sent();
@@ -47,8 +67,8 @@ var TableRow = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         if (itemAction) {
-                            onAction && onAction(e, itemAction, item === null || item === void 0 ? void 0 : item.data);
-                            item.toggle();
+                            onAction && onAction(e, itemAction, item === null || item === void 0 ? void 0 : item.locals);
+                            // item.toggle();
                         }
                         else {
                             if (item.checkable && item.isCheckAvaiableOnClick) {
@@ -62,7 +82,7 @@ var TableRow = /** @class */ (function (_super) {
     };
     TableRow.prototype.handleAction = function (e, action, ctx) {
         var _a = this.props, onAction = _a.onAction, item = _a.item;
-        onAction && onAction(e, action, ctx || item.data);
+        onAction && onAction(e, action, ctx || item.locals);
     };
     TableRow.prototype.handleQuickChange = function (values, saveImmediately, savePristine, options) {
         var _a = this.props, onQuickChange = _a.onQuickChange, item = _a.item;
@@ -89,7 +109,7 @@ var TableRow = /** @class */ (function (_super) {
             }
             return (React__default["default"].createElement("tr", { "data-id": item.id, "data-index": item.newIndex, onClick: checkOnItemClick || itemAction || (onEvent === null || onEvent === void 0 ? void 0 : onEvent.rowClick)
                     ? this.handleItemClick
-                    : undefined, className: cx(itemClassName, (_a = {
+                    : undefined, onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave, className: cx(itemClassName, (_a = {
                         'is-hovered': item.isHover,
                         'is-checked': item.checked,
                         'is-modified': item.modified,
@@ -114,7 +134,7 @@ var TableRow = /** @class */ (function (_super) {
         }
         return (React__default["default"].createElement("tr", { onClick: checkOnItemClick || itemAction || (onEvent === null || onEvent === void 0 ? void 0 : onEvent.rowClick)
                 ? this.handleItemClick
-                : undefined, "data-index": item.depth === 1 ? item.newIndex : undefined, "data-id": item.id, className: cx(itemClassName, (_b = {
+                : undefined, onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave, "data-index": item.depth === 1 ? item.newIndex : undefined, "data-id": item.id, className: cx(itemClassName, (_b = {
                     'is-hovered': item.isHover,
                     'is-checked': item.checked,
                     'is-modified': item.modified,

package/lib/renderers/Table/exportExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -39,7 +39,7 @@ var getAbsoluteUrl = (function () {
 function exportExcel(ExcelJS, props, toolbar) {
     var _a, _b, _c, _d;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var store, env, __, data, columns, rows, tmpStore, filename, res, _e, _f, key, workbook, worksheet, exportColumnNames, columns_1, columns_1_1, column, filteredColumns, firstRowLabels, firstRow, remoteMappingCache, rowIndex, rows_1, rows_1_1, row, rowData, sheetRow, columIndex, filteredColumns_1, filteredColumns_1_1, column, name_1, value, type, imageData, imageDimensions, imageWidth, imageHeight, imageMaxSize, imageMatch, imageExt, imageId, linkURL, e_1, href, linkURL, body, text, absoluteURL, map, source, sourceValue, mapKey, res, viewValue, viewValue, _g, fromNow, _h, format, _j, valueFormat, ISODate, NormalDate, db, e_2_1, e_3_1, buffer, blob;
+        var store, env, __, data, columns, rows, tmpStore, filename, res, _e, _f, key, workbook, worksheet, exportColumnNames, columns_1, columns_1_1, column, filteredColumns, firstRowLabels, firstRow, remoteMappingCache, rowIndex, rows_1, rows_1_1, row, rowData, sheetRow, columIndex, filteredColumns_1, filteredColumns_1_1, column, name_1, value, type, imageData, imageDimensions, imageWidth, imageHeight, imageMaxSize, imageMatch, imageExt, imageId, linkURL, e_1, href, linkURL, body, text, absoluteURL, map, source, sourceValue, mapKey, res, viewValue, text, viewValue, _g, fromNow, _h, format, _j, valueFormat, ISODate, NormalDate, db, e_2_1, e_3_1, buffer, blob;
         var e_4, _k, e_5, _l, e_3, _m, e_2, _o;
         return tslib.__generator(this, function (_p) {
             switch (_p.label) {
@@ -294,7 +294,15 @@ function exportExcel(ExcelJS, props, toolbar) {
                             : value === false && map['0']
                                 ? map['0']
                                 : map['*']);
-                        sheetRow.getCell(columIndex).value = amisCore.removeHTMLTag(viewValue);
+                        text = amisCore.removeHTMLTag(viewValue);
+                        /** map可能会使用比较复杂的html结构，富文本也无法完全支持，直接把里面的变量解析出来即可 */
+                        if (amisCore.isPureVariable(text)) {
+                            text = amisCore.resolveVariableAndFilter(text, rowData, '| raw');
+                        }
+                        else {
+                            text = amisCore.filter(text, rowData);
+                        }
+                        sheetRow.getCell(columIndex).value = text;
                     }
                     else {
                         sheetRow.getCell(columIndex).value = amisCore.removeHTMLTag(value);

package/lib/renderers/Table/index.d.ts

@@ -6,12 +6,13 @@ import { BadgeObject, SpinnerExtraProps } from 'amis-ui';
 import { ITableStore } from 'amis-core';
 import Sortable from 'sortablejs';
 import { TableCell } from './TableCell';
+import type { AutoGenerateFilterObject } from '../CRUD';
 import { BaseSchema, SchemaApi, SchemaClassName, SchemaObject, SchemaTokenizeableString, SchemaTpl } from '../../Schema';
 import { SchemaPopOver } from '../PopOver';
 import { SchemaQuickEdit } from '../QuickEdit';
 import { SchemaCopyable } from '../Copyable';
 import { SchemaRemark } from '../Remark';
-import type { IColumn, IRow } from 'amis-core/lib/store/table';
+import type { IColumn, IRow } from 'amis-core';
 /**
  * 表格列，不指定类型时默认为文本类型。
  */
@@ -116,7 +117,7 @@ export type TableColumn = TableColumnWithType | TableColumnObject;
 type AutoFillHeightObject = Record<'height' | 'maxHeight', number>;
 /**
  * Table 表格渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/table
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/table
  */
 export interface TableSchema extends BaseSchema {
     /**
@@ -212,7 +213,7 @@ export interface TableSchema extends BaseSchema {
     /**
      * 开启查询区域，会根据列元素的searchable属性值，自动生成查询条件表单
      */
-    autoGenerateFilter?: boolean;
+    autoGenerateFilter?: AutoGenerateFilterObject | boolean;
     /**
      * 表格是否可以获取父级数据域值，默认为false
      */
@@ -288,7 +289,7 @@ export type ExportExcelToolbar = SchemaNode & {
     exportColumns?: any[];
     filename?: string;
 };
-export type TableRendererEvent = 'selectedChange' | 'columnSort' | 'columnFilter' | 'columnSearch' | 'columnToggled' | 'orderChange' | 'rowClick';
+export type TableRendererEvent = 'selectedChange' | 'columnSort' | 'columnFilter' | 'columnSearch' | 'columnToggled' | 'orderChange' | 'rowClick' | 'rowMouseEnter' | 'rowMouseLeave';
 export type TableRendererAction = 'selectAll' | 'clearAll' | 'select' | 'initDrag';
 export default class Table extends React.Component<TableProps, object> {
     static contextType: React.Context<IScopedContext>;

package/lib/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -900,14 +900,20 @@ var Table = /** @class */ (function (_super) {
         store.updateColumns(columns);
     };
     Table.prototype.renderAutoFilterForm = function () {
-        var _a = this.props, render = _a.render, store = _a.store, onSearchableFromReset = _a.onSearchableFromReset, onSearchableFromSubmit = _a.onSearchableFromSubmit, onSearchableFromInit = _a.onSearchableFromInit, cx = _a.classnames, __ = _a.translate;
+        var _a = this.props, render = _a.render, store = _a.store, onSearchableFromReset = _a.onSearchableFromReset, onSearchableFromSubmit = _a.onSearchableFromSubmit, onSearchableFromInit = _a.onSearchableFromInit, cx = _a.classnames, autoGenerateFilter = _a.autoGenerateFilter, __ = _a.translate;
+        var _b = typeof autoGenerateFilter === 'boolean'
+            ? {
+                columnsNum: 3,
+                showBtnToolbar: true
+            }
+            : autoGenerateFilter, columnsNum = _b.columnsNum, showBtnToolbar = _b.showBtnToolbar;
         var searchableColumns = store.searchableColumns;
         var activedSearchableColumns = store.activedSearchableColumns;
         if (!searchableColumns.length) {
             return null;
         }
         var body = [];
-        amisCore.padArr(activedSearchableColumns, 3, true).forEach(function (group) {
+        amisCore.padArr(activedSearchableColumns, columnsNum, true).forEach(function (group) {
             var children = [];
             group.forEach(function (column) {
                 var _a, _b, _c, _d;
@@ -928,7 +934,7 @@ var Table = /** @class */ (function (_super) {
                 body: children
             });
         });
-        var showExpander = body.length > 1;
+        var showExpander = searchableColumns.length > columnsNum;
         // todo 以后做动画
         if (!store.searchFormExpanded) {
             body.splice(1, body.length - 1);
@@ -949,6 +955,7 @@ var Table = /** @class */ (function (_super) {
                     trigger: 'click',
                     size: 'sm',
                     align: 'right',
+                    visible: showBtnToolbar,
                     buttons: searchableColumns.map(function (column) {
                         var _a, _b, _c, _d;
                         return {
@@ -1065,10 +1072,10 @@ var Table = /** @class */ (function (_super) {
         }
         var affix = [];
         if (column.searchable && column.name && !autoGenerateFilter) {
-            affix.push(React__default["default"].createElement(HeadCellSearchDropdown.HeadCellSearchDropDown, tslib.__assign({ key: "table-head-search" }, this.props, { onQuery: onQuery, name: column.name, searchable: column.searchable, sortable: false, type: column.type, data: query, orderBy: store.orderBy, orderDir: store.orderDir, popOverContainer: this.getPopOverContainer })));
+            affix.push(React__default["default"].createElement(HeadCellSearchDropdown.HeadCellSearchDropDown, tslib.__assign({}, props, { key: "table-head-search" }, this.props, { onQuery: onQuery, name: column.name, searchable: column.searchable, sortable: false, type: column.type, data: query, orderBy: store.orderBy, orderDir: store.orderDir, popOverContainer: this.getPopOverContainer })));
         }
         if (column.sortable && column.name) {
-            affix.push(React__default["default"].createElement("span", { key: "table-head-sort", className: cx('TableCell-sortBtn'), onClick: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+            affix.push(React__default["default"].createElement("span", tslib.__assign({}, props, { key: "table-head-sort", className: cx('TableCell-sortBtn'), onClick: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
                     var orderBy, orderDir, order, rendererEvent;
                     return tslib.__generator(this, function (_a) {
                         switch (_a.label) {
@@ -1104,7 +1111,7 @@ var Table = /** @class */ (function (_super) {
                                 return [2 /*return*/];
                         }
                     });
-                }); } },
+                }); } }),
                 React__default["default"].createElement("i", { className: cx('TableCell-sortBtn--down', store.orderBy === column.name && store.orderDir === 'desc'
                         ? 'is-active'
                         : '') },
@@ -1281,13 +1288,16 @@ var Table = /** @class */ (function (_super) {
     Table.prototype.renderColumnsToggler = function (config) {
         var _this = this;
         var _a;
-        var _b = this.props; _b.className; var store = _b.store, ns = _b.classPrefix, cx = _b.classnames, rest = tslib.__rest(_b, ["className", "store", "classPrefix", "classnames"]);
+        var _b = this.props; _b.className; var store = _b.store, ns = _b.classPrefix, cx = _b.classnames, affixRow = _b.affixRow, rest = tslib.__rest(_b, ["className", "store", "classPrefix", "classnames", "affixRow"]);
         var __ = rest.translate;
         var env = rest.env;
         var render = this.props.render;
         if (!store.columnsTogglable) {
             return null;
         }
+        // 不能取消到比总结行要少
+        // 否则总结行将显示不全
+        var min = Math.max(Array.isArray(affixRow) ? affixRow.length : 0, 1);
         return (React__default["default"].createElement(ColumnToggler["default"], tslib.__assign({}, rest, (amisCore.isObject(config) ? config : {}), { tooltip: (config === null || config === void 0 ? void 0 : config.tooltip) || __('Table.columnsVisibility'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, align: (_a = config === null || config === void 0 ? void 0 : config.align) !== null && _a !== void 0 ? _a : 'left', isActived: store.hasColumnHidden(), classnames: cx, classPrefix: ns, key: "columns-toggable", size: (config === null || config === void 0 ? void 0 : config.size) || 'sm', icon: config === null || config === void 0 ? void 0 : config.icon, label: config === null || config === void 0 ? void 0 : config.label, draggable: config === null || config === void 0 ? void 0 : config.draggable, columns: store.columnsData, activeToggaleColumns: store.activeToggaleColumns, onColumnToggle: this.handleColumnToggle }),
             store.toggableColumns.length ? (React__default["default"].createElement("li", { className: cx('ColumnToggler-menuItem'), key: 'selectAll', onClick: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
                     var _a, data, dispatchEvent, allToggled, rendererEvent;
@@ -1307,7 +1317,7 @@ var Table = /** @class */ (function (_super) {
                                 if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                                     return [2 /*return*/];
                                 }
-                                store.toggleAllColumns();
+                                store.toggleAllColumns(min);
                                 return [2 /*return*/];
                         }
                     });
@@ -1336,7 +1346,7 @@ var Table = /** @class */ (function (_super) {
                                 if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                                     return [2 /*return*/];
                                 }
-                                column.toggleToggle();
+                                column.toggleToggle(min);
                                 return [2 /*return*/];
                         }
                     });

package/lib/renderers/Table2/ColumnToggler.js

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

package/lib/renderers/Table2/HeadCellSearchDropdown.d.ts

@@ -10,7 +10,7 @@ export interface QuickSearchConfig {
 export interface HeadCellSearchProps extends RendererProps {
     name: string;
     searchable: boolean | QuickSearchConfig;
-    onSearch?: (values: object) => void;
+    onSearch?: Function;
     onAction?: Function;
     store: ITableStore2;
     sortable?: boolean;

package/lib/renderers/Table2/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -198,7 +198,7 @@ var HeadCellSearchDropDown = /** @class */ (function (_super) {
         var _a = this.props, render = _a.render, name = _a.name, data = _a.data, searchable = _a.searchable, store = _a.store, orderBy = _a.orderBy, popOverContainer = _a.popOverContainer, ns = _a.classPrefix, cx = _a.classnames;
         var formSchema = this.buildSchema();
         var isActive = this.isActive();
-        return (React__default["default"].createElement(amisUi.HeadCellDropDown, { className: "".concat(ns, "TableCell-searchBtn"), layerClassName: cx("".concat(ns, "TableCell-searchPopOver"), searchable.className), active: isActive, filterIcon: React__default["default"].createElement(amisUi.Icon, { icon: "search", className: "icon" }), popOverContainer: popOverContainer ? popOverContainer : function () { return ReactDOM.findDOMNode(_this); }, filterDropdown: function (_a) {
+        return (React__default["default"].createElement(amisUi.HeadCellDropDown, { className: "".concat(ns, "TableCell-searchBtn"), layerClassName: cx("".concat(ns, "TableCell-searchPopOver"), searchable.className), active: isActive, filterIcon: React__default["default"].createElement(amisUi.Icon, { icon: "search", className: "icon", iconContent: "table-search-icon" }), popOverContainer: popOverContainer ? popOverContainer : function () { return ReactDOM.findDOMNode(_this); }, filterDropdown: function (_a) {
                 _a.setSelectedKeys; _a.selectedKeys; var confirm = _a.confirm; _a.clearFilters;
                 return render('quick-search-form', formSchema, {
                     data: tslib.__assign(tslib.__assign({}, data), { orderBy: orderBy, order: orderBy && orderBy === name ? store.order : '' }),

package/lib/renderers/Table2/TableCell.js

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

package/lib/renderers/Table2/index.d.ts

@@ -9,7 +9,7 @@ import './ColumnToggler';
 import { Action } from '../../types';
 /**
  * Table 表格2渲染器。
- * 文档：https://baidu.gitee.io/amis/docs/components/table2
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/table2
  */
 export interface CellSpan {
     colIndex: number;
@@ -267,7 +267,7 @@ export interface TableSchema2 extends BaseSchema {
      */
     keepItemSelectionOnPageChange?: boolean;
 }
-export type Table2RendererEvent = 'selected' | 'columnSort' | 'columnFilter' | 'columnSearch' | 'columnToggled' | 'dragOver';
+export type Table2RendererEvent = 'selectedChange' | 'columnSort' | 'columnFilter' | 'columnSearch' | 'columnToggled' | 'orderChange' | 'rowClick' | 'rowMouseEnter' | 'rowMouseLeave';
 export type Table2RendererAction = 'selectAll' | 'clearAll' | 'select' | 'expand';
 export interface Table2Props extends RendererProps, SpinnerExtraProps {
     title?: string;
@@ -284,7 +284,7 @@ export interface Table2Props extends RendererProps, SpinnerExtraProps {
     onPristineChange?: Function;
     onAction?: Function;
     onSort?: Function;
-    onFilter?: Function;
+    onSearch?: Function;
     onRow?: OnRowProps;
     placeholder?: string | SchemaObject;
     itemActions?: Array<ActionObject>;
@@ -325,7 +325,9 @@ export default class Table2 extends React.Component<Table2Props, object> {
         filterName: string;
         filterValue: string;
     }): Promise<any>;
-    handleRowClick(event: React.ChangeEvent<any>, rowItem: any, rowIndex?: number): Promise<any>;
+    handleRowClick(event: React.ChangeEvent<any>, rowItem: any, rowIndex?: number): Promise<void>;
+    handleRowMouseEnter(event: React.MouseEvent<HTMLTableRowElement>, rowItem: any, rowIndex?: number): Promise<void>;
+    handleRowMouseLeave(event: React.MouseEvent<HTMLTableRowElement>, rowItem: any, rowIndex?: number): Promise<void>;
     handleOrderChange(oldIndex: number, newIndex: number, levels: Array<string>): Promise<void>;
     handleSaveOrder(): Promise<void>;
     reset(): void;