amis 2.0.0-rc.9 → 2.0.0

package/lib/renderers/Table-v2/ColumnToggler.js

@@ -1,19 +1,89 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */
 
 'use strict';
 
 var tslib = require('tslib');
+var React = require('react');
 var amisCore = require('amis-core');
+var amisUi = require('amis-ui');
 var ColumnToggler = require('../Table/ColumnToggler.js');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
 /** @class */ ((function (_super) {
     tslib.__extends(ColumnTogglerRenderer, _super);
     function ColumnTogglerRenderer() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    ColumnTogglerRenderer.prototype.render = function () {
+        var _this = this;
+        var _a = this.props; _a.className; _a.store; var render = _a.render, ns = _a.classPrefix, cx = _a.classnames, tooltip = _a.tooltip, align = _a.align, cols = _a.cols, toggleAllColumns = _a.toggleAllColumns, toggleToggle = _a.toggleToggle, data = _a.data, rest = tslib.__rest(_a, ["className", "store", "render", "classPrefix", "classnames", "tooltip", "align", "cols", "toggleAllColumns", "toggleToggle", "data"]);
+        var __ = rest.translate;
+        var env = rest.env;
+        if (!cols) {
+            return null;
+        }
+        var toggableColumns = cols.filter(function (item) { return amisCore.isVisible(item.pristine || item, data) && item.toggable !== false; });
+        var activeToggaleColumns = toggableColumns.filter(function (item) { return item.toggled !== false; });
+        return (React__default["default"].createElement(ColumnToggler["default"], tslib.__assign({}, rest, { render: render, tooltip: tooltip || __('Table.columnsVisibility'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, isActived: cols.findIndex(function (column) { return !column.toggled; }) !== -1, align: align !== null && align !== void 0 ? align : 'right', classnames: cx, classPrefix: ns, key: "columns-toggable", columns: cols, activeToggaleColumns: activeToggaleColumns, data: data }),
+            (toggableColumns === null || toggableColumns === void 0 ? void 0 : 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;
+                    return tslib.__generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
+                                _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                                allToggled = !((activeToggaleColumns === null || activeToggaleColumns === void 0 ? void 0 : activeToggaleColumns.length) ===
+                                    (toggableColumns === null || toggableColumns === void 0 ? void 0 : toggableColumns.length));
+                                return [4 /*yield*/, dispatchEvent('columnToggled', amisCore.createObject(data, {
+                                        columns: allToggled
+                                            ? toggableColumns === null || toggableColumns === void 0 ? void 0 : toggableColumns.map(function (column) { return column; })
+                                            : []
+                                    }))];
+                            case 1:
+                                rendererEvent = _b.sent();
+                                if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                                    return [2 /*return*/];
+                                }
+                                toggleAllColumns && toggleAllColumns(allToggled);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); } },
+                React__default["default"].createElement(amisUi.Checkbox, { size: "sm", classPrefix: ns, key: "checkall", checked: !!(activeToggaleColumns === null || activeToggaleColumns === void 0 ? void 0 : activeToggaleColumns.length), partial: !!((activeToggaleColumns === null || activeToggaleColumns === void 0 ? void 0 : activeToggaleColumns.length) &&
+                        (activeToggaleColumns === null || activeToggaleColumns === void 0 ? void 0 : activeToggaleColumns.length) !== (toggableColumns === null || toggableColumns === void 0 ? void 0 : toggableColumns.length)) }, __('Checkboxes.selectAll')))) : null, toggableColumns === null || toggableColumns === void 0 ? void 0 :
+            toggableColumns.map(function (column, index) { return (React__default["default"].createElement("li", { className: cx('ColumnToggler-menuItem'), key: 'item' + (column.index || index), onClick: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                    var _a, data, dispatchEvent, columns, rendererEvent;
+                    return tslib.__generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
+                                _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                                columns = activeToggaleColumns.map(function (item) { return item; });
+                                if (column.toggled !== false) {
+                                    columns.push(column);
+                                }
+                                else {
+                                    columns = columns.filter(function (c) { return c.key !== column.key; });
+                                }
+                                return [4 /*yield*/, dispatchEvent('columnToggled', amisCore.createObject(data, {
+                                        columns: columns
+                                    }))];
+                            case 1:
+                                rendererEvent = _b.sent();
+                                if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                                    return [2 /*return*/];
+                                }
+                                toggleToggle && toggleToggle(!(column.toggled !== false), index);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); } },
+                React__default["default"].createElement(amisUi.Checkbox, { size: "sm", classPrefix: ns, checked: column.toggled !== false }, column.title ? render('tpl', column.title) : null))); })));
+    };
     ColumnTogglerRenderer = tslib.__decorate([
         amisCore.Renderer({
             type: 'column-toggler',
@@ -21,4 +91,4 @@ var ColumnToggler = require('../Table/ColumnToggler.js');
         })
     ], ColumnTogglerRenderer);
     return ColumnTogglerRenderer;
-})(ColumnToggler["default"]));
+})(React__default["default"].Component));

package/lib/renderers/Table-v2/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table-v2/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */
 

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

@@ -4,10 +4,11 @@ import { RendererProps } from 'amis-core';
 import { ActionObject } from 'amis-core';
 import { BaseSchema, SchemaObject, SchemaTokenizeableString } from '../../Schema';
 import { BadgeObject } from 'amis-ui';
-import { ITableStoreV2, IColumnV2, IRowV2 } from 'amis-core';
+import { ITableStoreV2, IRowV2 } from 'amis-core';
 import './TableCell';
 import './ColumnToggler';
 import type { SortProps } from 'amis-ui/lib/components/table';
+import { Action } from '../../types';
 /**
  * Table 表格v2渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/table-v2
@@ -133,6 +134,10 @@ export interface RowSelectionSchema {
     rowClick?: boolean;
 }
 export interface ExpandableSchema {
+    /**
+     * 对应渲染器类型
+     */
+    type: string;
     /**
      * 对应数据源的key值
      */
@@ -170,7 +175,7 @@ export interface TableSchemaV2 extends BaseSchema {
     /**
      * 表格可自定义列
      */
-    columnsTogglable?: boolean;
+    columnsTogglable?: boolean | string | SchemaObject;
     /**
      * 表格列配置
      */
@@ -183,10 +188,6 @@ export interface TableSchemaV2 extends BaseSchema {
      * 表格行可展开配置
      */
     expandable?: ExpandableSchema;
-    /**
-     * 表格行可展开内容配置
-     */
-    expandableBody?: Array<SchemaObject>;
     /**
      * 粘性头部
      */
@@ -244,7 +245,7 @@ export interface TableV2Props extends RendererProps {
     store: ITableStoreV2;
     togglable: boolean;
 }
-export default class TableRenderer extends React.Component<TableV2Props, object> {
+export default class TableV2 extends React.Component<TableV2Props, object> {
     static contextType: React.Context<IScopedContext>;
     renderedToolbars: Array<string>;
     control: any;
@@ -262,9 +263,7 @@ export default class TableRenderer extends React.Component<TableV2Props, object>
     reloadTarget(target: string, data: any): void;
     handleSave(rows: Array<object> | object, diff: Array<object> | object, indexes: Array<string>, unModifiedItems?: Array<any>, rowsOrigin?: Array<object> | object, resetOnFailed?: boolean): void;
     handleQuickChange(item: IRowV2, values: object, saveImmediately?: boolean | any, savePristine?: boolean, resetOnFailed?: boolean): void;
-    handleColumnToggle(columns: Array<IColumnV2>): Promise<void>;
-    renderColumnsToggler(): JSX.Element | null;
-    handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object): void;
+    handleAction(e: React.UIEvent<any>, action: Action, ctx: object): void;
     renderActions(region: string): JSX.Element | null;
     handleSelected(selectedRows: Array<any>, selectedRowKeys: Array<string | number>, unSelectedRows: Array<string | number>): Promise<any>;
     handleSort(payload: SortProps): Promise<any>;
@@ -281,3 +280,6 @@ export default class TableRenderer extends React.Component<TableV2Props, object>
     renderHeading(): JSX.Element | null;
     render(): JSX.Element;
 }
+export declare class TableRenderer extends TableV2 {
+    receive(values: any, subPath?: string): void;
+}

package/lib/renderers/Table-v2/index.js

@@ -1,10 +1,12 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.0
  * Copyright 2018-2022 baidu
  */
 
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var tslib = require('tslib');
 var React = require('react');
 var ReactDOM = require('react-dom');
@@ -23,42 +25,35 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 
-/** @class */ ((function (_super) {
-    tslib.__extends(TableRenderer, _super);
-    function TableRenderer(props, context) {
+var TableV2 = /** @class */ (function (_super) {
+    tslib.__extends(TableV2, _super);
+    function TableV2(props, context) {
         var _this = _super.call(this, props) || this;
         _this.renderedToolbars = [];
         var scoped = context;
         scoped.registerComponent(_this);
-        _this.handleColumnToggle = _this.handleColumnToggle.bind(_this);
-        _this.getPopOverContainer = _this.getPopOverContainer.bind(_this);
-        _this.handleAction = _this.handleAction.bind(_this);
-        _this.handleQuickChange = _this.handleQuickChange.bind(_this);
-        _this.handleSave = _this.handleSave.bind(_this);
-        _this.controlRef = _this.controlRef.bind(_this);
         var store = props.store, columnsTogglable = props.columnsTogglable, columns = props.columns;
         store.update({ columnsTogglable: columnsTogglable, columns: columns });
-        TableRenderer_1.syncRows(store, props, undefined) && _this.syncSelected();
+        TableV2.syncRows(store, props, undefined) && _this.syncSelected();
         return _this;
     }
-    TableRenderer_1 = TableRenderer;
-    TableRenderer.prototype.componentWillUnmount = function () {
+    TableV2.prototype.componentWillUnmount = function () {
         var scoped = this.context;
         scoped.unRegisterComponent(this);
     };
-    TableRenderer.prototype.controlRef = function (control) {
+    TableV2.prototype.controlRef = function (control) {
         // 因为 control 有可能被 n 层 hoc 包裹。
         while (control && control.getWrappedInstance) {
             control = control.getWrappedInstance();
         }
         this.control = control;
     };
-    TableRenderer.prototype.syncSelected = function () {
+    TableV2.prototype.syncSelected = function () {
         var _a = this.props, store = _a.store, onSelect = _a.onSelect;
         onSelect &&
             onSelect(store.selectedRows.map(function (item) { return item.data; }), store.unSelectedRows.map(function (item) { return item.data; }));
     };
-    TableRenderer.syncRows = function (store, props, prevProps) {
+    TableV2.syncRows = function (store, props, prevProps) {
         var source = props.source;
         var value = props.value || props.items;
         var rows = [];
@@ -124,7 +119,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
         }
         return updateRows;
     };
-    TableRenderer.prototype.componentDidUpdate = function (prevProps) {
+    TableV2.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
         var store = props.store;
         if (amisCore.anyChanged(['columnsTogglable'], prevProps, props)) {
@@ -137,7 +132,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
                 !props.items &&
                 (props.data !== prevProps.data ||
                     (typeof props.source === 'string' && amisCore.isPureVariable(props.source))))) {
-            TableRenderer_1.syncRows(store, props, prevProps) && this.syncSelected();
+            TableV2.syncRows(store, props, prevProps) && this.syncSelected();
         }
         if (!isEqual__default["default"](prevProps.columns, props.columns)) {
             store.update({
@@ -145,10 +140,10 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             });
         }
     };
-    TableRenderer.prototype.getPopOverContainer = function () {
+    TableV2.prototype.getPopOverContainer = function () {
         return ReactDOM.findDOMNode(this);
     };
-    TableRenderer.prototype.renderCellSchema = function (schema, props) {
+    TableV2.prototype.renderCellSchema = function (schema, props) {
         var render = this.props.render;
         // Table Cell SchemaObject转化成ReactNode
         if (schema && amisCore.isObject(schema)) {
@@ -162,7 +157,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
         }
         return schema;
     };
-    TableRenderer.prototype.renderSchema = function (key, schema, props) {
+    TableV2.prototype.renderSchema = function (key, schema, props) {
         var render = this.props.render;
         // Header、Footer等SchemaObject转化成ReactNode
         if (schema && amisCore.isObject(schema)) {
@@ -178,7 +173,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
         return schema;
     };
     // editor传来的处理过的column 还可能包含其他字段
-    TableRenderer.prototype.buildColumns = function (columns) {
+    TableV2.prototype.buildColumns = function (columns) {
         var _this = this;
         var _a = this.props, env = _a.env, render = _a.render, store = _a.store, popOverContainer = _a.popOverContainer, canAccessSuperData = _a.canAccessSuperData, showBadge = _a.showBadge, itemBadge = _a.itemBadge, cx = _a.classnames;
         var cols = [];
@@ -225,7 +220,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
                     Object.assign(clone, {
                         render: function (text, record, rowIndex, colIndex) {
                             var props = {};
-                            var item = store.getRowByIndex(rowIndex);
+                            var item = store.getRowByIndex(rowIndex) || {};
                             var obj = {
                                 children: _this.renderCellSchema(column, {
                                     data: item.locals,
@@ -300,7 +295,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             });
         return cols;
     };
-    TableRenderer.prototype.buildSummary = function (key, summary) {
+    TableV2.prototype.buildSummary = function (key, summary) {
         var _this = this;
         var result = [];
         if (Array.isArray(summary)) {
@@ -336,11 +331,11 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
         }
         return result.length ? result : null;
     };
-    TableRenderer.prototype.reloadTarget = function (target, data) {
+    TableV2.prototype.reloadTarget = function (target, data) {
         var scoped = this.context;
         scoped.reload(target, data);
     };
-    TableRenderer.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, resetOnFailed) {
+    TableV2.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, resetOnFailed) {
         var _this = this;
         var _a = this.props, store = _a.store, quickSaveApi = _a.quickSaveApi, quickSaveItemApi = _a.quickSaveItemApi, primaryField = _a.primaryField, env = _a.env, messages = _a.messages, reload = _a.reload;
         if (Array.isArray(rows)) {
@@ -393,7 +388,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             });
         }
     };
-    TableRenderer.prototype.handleQuickChange = function (item, values, saveImmediately, savePristine, resetOnFailed) {
+    TableV2.prototype.handleQuickChange = function (item, values, saveImmediately, savePristine, resetOnFailed) {
         if (!mobxStateTree.isAlive(item)) {
             return;
         }
@@ -416,60 +411,33 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             ? onSave(item.data, amisCore.difference(item.data, item.pristine, ['id', primaryField]), item.path, undefined, item.pristine, resetOnFailed)
             : this.handleSave(quickSaveItemApi ? item.data : [item.data], amisCore.difference(item.data, item.pristine, ['id', primaryField]), [item.path], undefined, item.pristine, resetOnFailed);
     };
-    TableRenderer.prototype.handleColumnToggle = function (columns) {
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, store, rendererEvent;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, store = _a.store;
-                        return [4 /*yield*/, dispatchEvent('columnToggled', amisCore.createObject(data, {
-                                columns: columns
-                            }))];
-                    case 1:
-                        rendererEvent = _b.sent();
-                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
-                            return [2 /*return*/];
-                        }
-                        store.update({ columns: columns });
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    TableRenderer.prototype.renderColumnsToggler = function () {
-        var _a = this.props; _a.className; var store = _a.store, render = _a.render, ns = _a.classPrefix, cx = _a.classnames, rest = tslib.__rest(_a, ["className", "store", "render", "classPrefix", "classnames"]);
-        rest.translate;
-        rest.env;
-        if (!store.toggable) {
-            return null;
-        }
-        var children = store.toggableColumns.map(function (column, index) { return (React__default["default"].createElement("li", { className: cx('ColumnToggler-menuItem'), key: 'toggable-li-' + index, onClick: column.toggleToggle },
-            React__default["default"].createElement(amisUi.Checkbox, { key: 'toggable-select' + index, size: "sm", classPrefix: ns, checked: column.toggled }, column.title ? render('tpl', column.title) : null))); });
-        return render('column-toggler', {
-            type: 'column-toggler'
-        }, {
-            isActived: store.hasColumnHidden(),
-            columns: store.columnsData,
-            onColumnToggle: this.handleColumnToggle,
-            children: children
-        });
-    };
-    TableRenderer.prototype.handleAction = function (e, action, ctx) {
+    TableV2.prototype.handleAction = function (e, action, ctx) {
         var onAction = this.props.onAction;
         // todo
         onAction(e, action, ctx);
     };
-    TableRenderer.prototype.renderActions = function (region) {
+    TableV2.prototype.renderActions = function (region) {
         var _this = this;
-        var _a = this.props, actions = _a.actions, render = _a.render, store = _a.store, cx = _a.classnames, data = _a.data;
+        var _a = this.props, actions = _a.actions, render = _a.render, store = _a.store, cx = _a.classnames, data = _a.data, columnsTogglable = _a.columnsTogglable, $path = _a.$path;
+        // 如果table是在crud里面，自定义显示列配置在grid里，这里就不需要渲染了
+        var isInCrud = /(?:\/|^)crud2\//.test($path);
         actions = Array.isArray(actions) ? actions.concat() : [];
-        if (store.toggable &&
+        // 现在默认从crud里传进来的columnsTogglable是boolean类型
+        // table单独配置的是SchemaNode类型
+        if (!isInCrud &&
+            store.toggable &&
             region === 'header' &&
             !~this.renderedToolbars.indexOf('columns-toggler')) {
             actions.push({
                 type: 'button',
-                children: this.renderColumnsToggler()
+                children: render('column-toggler', tslib.__assign(tslib.__assign({}, (amisCore.isObject(columnsTogglable) ? columnsTogglable : {})), { type: 'column-toggler' }), {
+                    cols: store.columnsData.map(function (item) { return item.pristine; }),
+                    toggleAllColumns: function () { return store.toggleAllColumns(); },
+                    toggleToggle: function (toggled, index) {
+                        var column = store.columnsData[index];
+                        column.toggleToggle();
+                    }
+                })
             });
         }
         return Array.isArray(actions) && actions.length ? (React__default["default"].createElement("div", { className: cx('Table-toolbar') }, actions.map(function (action, key) {
@@ -481,7 +449,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             });
         }))) : null;
     };
-    TableRenderer.prototype.handleSelected = function (selectedRows, selectedRowKeys, unSelectedRows) {
+    TableV2.prototype.handleSelected = function (selectedRows, selectedRowKeys, unSelectedRows) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, dispatchEvent, data, rowSelection, onSelect, store, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -504,7 +472,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             });
         });
     };
-    TableRenderer.prototype.handleSort = function (payload) {
+    TableV2.prototype.handleSort = function (payload) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, dispatchEvent, data, onSort, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -526,7 +494,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             });
         });
     };
-    TableRenderer.prototype.handleFilter = function (payload) {
+    TableV2.prototype.handleFilter = function (payload) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, dispatchEvent, data, onFilter, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -545,7 +513,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             });
         });
     };
-    TableRenderer.prototype.handleRowClick = function (event, rowItem, rowIndex) {
+    TableV2.prototype.handleRowClick = function (event, rowItem, rowIndex) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, dispatchEvent, data, onRow, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -566,7 +534,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             });
         });
     };
-    TableRenderer.prototype.handleOrderChange = function (oldIndex, newIndex, levels) {
+    TableV2.prototype.handleOrderChange = function (oldIndex, newIndex, levels) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var store, rowItem;
             return tslib.__generator(this, function (_a) {
@@ -577,7 +545,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             });
         });
     };
-    TableRenderer.prototype.handleSaveOrder = function () {
+    TableV2.prototype.handleSaveOrder = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, store, onSaveOrder, data, dispatchEvent, movedItems, items, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -601,11 +569,11 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             });
         });
     };
-    TableRenderer.prototype.reset = function () {
+    TableV2.prototype.reset = function () {
         var store = this.props.store;
         store.reset();
     };
-    TableRenderer.prototype.doAction = function (action, args, throwErrors) {
+    TableV2.prototype.doAction = function (action, args, throwErrors) {
         var _a = this.props, store = _a.store, rowSelection = _a.rowSelection, data = _a.data;
         var actionType = action === null || action === void 0 ? void 0 : action.actionType;
         var keyField = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField;
@@ -632,9 +600,9 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
                 break;
         }
     };
-    TableRenderer.prototype.renderTable = function () {
+    TableV2.prototype.renderTable = function () {
         var _this = this;
-        var _a = this.props, render = _a.render, title = _a.title, footer = _a.footer, rowSelection = _a.rowSelection; _a.columns; var expandable = _a.expandable, expandableBody = _a.expandableBody, footSummary = _a.footSummary, headSummary = _a.headSummary, loading = _a.loading, cx = _a.classnames, placeholder = _a.placeholder, rowClassNameExpr = _a.rowClassNameExpr, itemActions = _a.itemActions, onRow = _a.onRow, store = _a.store, rest = tslib.__rest(_a, ["render", "title", "footer", "rowSelection", "columns", "expandable", "expandableBody", "footSummary", "headSummary", "loading", "classnames", "placeholder", "rowClassNameExpr", "itemActions", "onRow", "store"]);
+        var _a = this.props, render = _a.render, title = _a.title, footer = _a.footer, rowSelection = _a.rowSelection; _a.columns; var expandable = _a.expandable; _a.expandableBody; var footSummary = _a.footSummary, headSummary = _a.headSummary, loading = _a.loading, cx = _a.classnames, placeholder = _a.placeholder, rowClassNameExpr = _a.rowClassNameExpr, itemActions = _a.itemActions, onRow = _a.onRow, store = _a.store, rest = tslib.__rest(_a, ["render", "title", "footer", "rowSelection", "columns", "expandable", "expandableBody", "footSummary", "headSummary", "loading", "classnames", "placeholder", "rowClassNameExpr", "itemActions", "onRow", "store"]);
         var expandableConfig = null;
         if (expandable) {
             expandable.expandedRowKeys; var rest_1 = tslib.__rest(expandable, ["expandedRowKeys"]);
@@ -645,9 +613,9 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
                 };
                 delete expandableConfig.expandableOn;
             }
-            if (expandableBody && expandableBody.length > 0) {
+            if (expandable && expandable.type) {
                 expandableConfig.expandedRowRender = function (record, rowIndex) {
-                    return _this.renderSchema('expandableBody', expandableBody, { data: record });
+                    return _this.renderSchema('expandableBody', tslib.__assign({}, expandable), { data: record });
                 };
             }
             if (expandable.expandedRowClassNameExpr) {
@@ -734,7 +702,7 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
         }
         return (React__default["default"].createElement(amisUi.Table, tslib.__assign({}, rest, { title: this.renderSchema('title', title, { data: this.props.data }), footer: this.renderSchema('footer', footer, { data: this.props.data }), columns: this.buildColumns(store.filteredColumns), dataSource: store.dataSource, rowSelection: rowSelectionConfig, rowClassName: rowClassName, expandable: expandableConfig, footSummary: this.buildSummary('footSummary', footSummary), headSummary: this.buildSummary('headSummary', headSummary), loading: this.renderSchema('loading', loading), placeholder: this.renderSchema('placeholder', placeholder), onSelect: this.handleSelected, onSelectAll: this.handleSelected, onSort: this.handleSort, onFilter: this.handleFilter, onDrag: this.handleOrderChange, itemActions: itemActionsConfig, onRow: tslib.__assign(tslib.__assign({}, onRow), { onRowClick: this.handleRowClick }) })));
     };
-    TableRenderer.prototype.renderHeading = function () {
+    TableV2.prototype.renderHeading = function () {
         var _a = this.props, store = _a.store, cx = _a.classnames, headingClassName = _a.headingClassName, __ = _a.translate;
         if (store.moved) {
             return (React__default["default"].createElement("div", { className: cx('Table-heading', headingClassName), key: "heading" }, store.moved ? (React__default["default"].createElement("span", null,
@@ -750,17 +718,48 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
         }
         return null;
     };
-    TableRenderer.prototype.render = function () {
-        var cx = this.props.classnames;
+    TableV2.prototype.render = function () {
+        var _a = this.props, cx = _a.classnames, _b = _a.loading, loading = _b === void 0 ? false : _b;
         this.renderedToolbars = []; // 用来记录哪些 toolbar 已经渲染了
         var heading = this.renderHeading();
         return (React__default["default"].createElement("div", { className: cx('Table-render-wrapper') },
             this.renderActions('header'),
             heading,
-            this.renderTable()));
+            this.renderTable(),
+            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
     };
-    var TableRenderer_1;
-    TableRenderer.contextType = amisCore.ScopedContext;
+    TableV2.contextType = amisCore.ScopedContext;
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TableV2.prototype, "controlRef", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TableV2.prototype, "getPopOverContainer", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Object, Array,
+            Array, Object, Boolean]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TableV2.prototype, "handleSave", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Object, Object, Boolean, Boolean]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TableV2.prototype, "handleQuickChange", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Object, Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TableV2.prototype, "handleAction", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
@@ -768,51 +767,77 @@ var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
             Array,
             Array]),
         tslib.__metadata("design:returntype", Promise)
-    ], TableRenderer.prototype, "handleSelected", null);
+    ], TableV2.prototype, "handleSelected", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
-    ], TableRenderer.prototype, "handleSort", null);
+    ], TableV2.prototype, "handleSort", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
-    ], TableRenderer.prototype, "handleFilter", null);
+    ], TableV2.prototype, "handleFilter", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object, Object, Number]),
         tslib.__metadata("design:returntype", Promise)
-    ], TableRenderer.prototype, "handleRowClick", null);
+    ], TableV2.prototype, "handleRowClick", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Number, Number, Array]),
         tslib.__metadata("design:returntype", Promise)
-    ], TableRenderer.prototype, "handleOrderChange", null);
+    ], TableV2.prototype, "handleOrderChange", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", Promise)
-    ], TableRenderer.prototype, "handleSaveOrder", null);
+    ], TableV2.prototype, "handleSaveOrder", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
-    ], TableRenderer.prototype, "reset", null);
-    TableRenderer = TableRenderer_1 = tslib.__decorate([
+    ], TableV2.prototype, "reset", null);
+    return TableV2;
+}(React__default["default"].Component));
+/** @class */ ((function (_super) {
+    tslib.__extends(TableRenderer, _super);
+    function TableRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    TableRenderer.prototype.receive = function (values, subPath) {
+        var _this = this;
+        var _a, _b;
+        var scoped = this.context;
+        var parents = (_a = scoped === null || scoped === void 0 ? void 0 : scoped.parent) === null || _a === void 0 ? void 0 : _a.getComponents();
+        /**
+         * 因为Table在scope上注册，导致getComponentByName查询组件时会优先找到Table，和CRUD联动的动作都会失效
+         * 这里先做兼容处理，把动作交给上层的CRUD处理
+         */
+        if (Array.isArray(parents) && parents.length) {
+            // CRUD的name会透传给Table，这样可以保证找到CRUD
+            var crud = parents.find(function (cmpt) { var _a, _b; return ((_a = cmpt === null || cmpt === void 0 ? void 0 : cmpt.props) === null || _a === void 0 ? void 0 : _a.name) === ((_b = _this.props) === null || _b === void 0 ? void 0 : _b.name); });
+            return (_b = crud === null || crud === void 0 ? void 0 : crud.receive) === null || _b === void 0 ? void 0 : _b.call(crud, values, subPath);
+        }
+        if (subPath) {
+            return scoped.send(subPath, values);
+        }
+    };
+    TableRenderer = tslib.__decorate([
         amisCore.Renderer({
             type: 'table-v2',
             storeType: amisCore.TableStoreV2.name,
             name: 'table-v2',
             isolateScope: true
-        }),
-        tslib.__metadata("design:paramtypes", [Object, Object])
+        })
     ], TableRenderer);
     return TableRenderer;
-})(React__default["default"].Component));
+})(TableV2));
+
+exports["default"] = TableV2;