amis 2.0.0-rc.10 → 2.0.0-rc.16

package/lib/renderers/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -11,8 +11,8 @@ var tslib = require('tslib');
 var React = require('react');
 var ReactDOM = require('react-dom');
 var hoistNonReactStatic = require('hoist-non-react-statics');
-var amisUi = require('amis-ui');
 var amisCore = require('amis-core');
+var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -129,8 +129,8 @@ var HocPopOver = function (config) {
                             : undefined, onMouseEnter: (popOver === null || popOver === void 0 ? void 0 : popOver.trigger) === 'hover'
                             ? _this.clearCloseTimer
                             : undefined, ref: ref }, content));
-                })) : (React__default["default"].createElement(amisUi.Overlay, { container: popOverContainer, placement: position || config.position || 'center', target: function () { return _this.target; }, onHide: this.closePopOver, rootClose: true, show: true },
-                    React__default["default"].createElement(amisUi.PopOver, { classPrefix: ns, className: cx('PopOverAble-popover', popOver.popOverClassName), offset: popOver.offset, onMouseLeave: (popOver === null || popOver === void 0 ? void 0 : popOver.trigger) === 'hover'
+                })) : (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer, placement: position || config.position || 'center', target: function () { return _this.target; }, onHide: this.closePopOver, rootClose: true, show: true },
+                    React__default["default"].createElement(amisCore.PopOver, { classPrefix: ns, className: cx('PopOverAble-popover', popOver.popOverClassName), offset: popOver.offset, onMouseLeave: (popOver === null || popOver === void 0 ? void 0 : popOver.trigger) === 'hover'
                             ? this.closePopOver
                             : undefined, onMouseEnter: (popOver === null || popOver === void 0 ? void 0 : popOver.trigger) === 'hover'
                             ? this.clearCloseTimer

package/lib/renderers/Portlet.js

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

package/lib/renderers/Progress.js

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

package/lib/renderers/Property.js

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

package/lib/renderers/QRCode.js

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

package/lib/renderers/QuickEdit.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -12,6 +12,7 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var hoistNonReactStatic = require('hoist-non-react-statics');
 var keycode = require('keycode');
+var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -298,8 +299,8 @@ var HocQuickEdit = function (config) {
                     formStore: undefined
                 })));
                 popOverContainer = popOverContainer || (function () { return ReactDOM.findDOMNode(_this); });
-                return (React__default["default"].createElement(amisUi.Overlay, { container: popOverContainer, target: function () { return _this.target; }, onHide: this.closeQuickEdit, placement: "left-top right-top left-bottom right-bottom left-top", show: true },
-                    React__default["default"].createElement(amisUi.PopOver, { classPrefix: ns, className: cx("".concat(ns, "QuickEdit-popover"), quickEdit.popOverClassName), onHide: this.closeQuickEdit, overlay: true }, content)));
+                return (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer, target: function () { return _this.target; }, onHide: this.closeQuickEdit, placement: "left-top right-top left-bottom right-bottom left-top", show: true },
+                    React__default["default"].createElement(amisCore.PopOver, { classPrefix: ns, className: cx("".concat(ns, "QuickEdit-popover"), quickEdit.popOverClassName), onHide: this.closeQuickEdit, overlay: true }, content)));
             };
             QuickEditComponent.prototype.render = function () {
                 var _a = this.props, onQuickChange = _a.onQuickChange, quickEdit = _a.quickEdit, quickEditEnabled = _a.quickEditEnabled, className = _a.className, cx = _a.classnames, render = _a.render, noHoc = _a.noHoc, canAccessSuperData = _a.canAccessSuperData, disabled = _a.disabled;

package/lib/renderers/Remark.d.ts

@@ -59,7 +59,7 @@ declare class Remark extends React.Component<RemarkProps> {
     static propsList: Array<string>;
     static defaultProps: {
         icon: string;
-        trigger: ("focus" | "click" | "hover")[];
+        trigger: ("click" | "hover" | "focus")[];
     };
     showModalTip(tooltip?: string | TooltipObject): (e: React.MouseEvent) => void;
     renderLabel(finalIcon: any, finalLabel: string, cx: ClassNamesFn, shape?: 'circle' | 'square'): JSX.Element;

package/lib/renderers/Remark.js

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

package/lib/renderers/SearchBox.js

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

package/lib/renderers/Service.js

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

package/lib/renderers/SparkLine.js

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

package/lib/renderers/Spinner.js

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

package/lib/renderers/Status.js

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

package/lib/renderers/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -19,7 +19,8 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 function StepsCmpt(props) {
     var _a;
     var className = props.className, steps = props.steps, status = props.status, mode = props.mode, labelPlacement = props.labelPlacement, progressDot = props.progressDot, data = props.data, source = props.source, config = props.config, render = props.render, useMobileUI = props.useMobileUI;
-    var stepsRow = amisCore.resolveVariableAndFilter(source, data, '| raw') ||
+    var sourceResult = amisCore.resolveVariableAndFilter(source, data, '| raw');
+    var stepsRow = (Array.isArray(sourceResult) ? sourceResult : undefined) ||
         config ||
         steps ||
         [];

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

@@ -2,7 +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 type { IColumn } from 'amis-core/lib/store/table';
+import { IColumn } from 'amis-core/lib/store/table';
+import type { IColumnV2 } from 'amis-core/lib/store/table-v2';
 export interface ColumnTogglerProps extends RendererProps {
     /**
      * 按钮文字
@@ -79,12 +80,12 @@ export interface ColumnTogglerProps extends RendererProps {
     /**
      * 列数据
      */
-    columns: Array<IColumn>;
+    columns: Array<IColumn | IColumnV2>;
     /**
      * 弹窗底部按钮大小
      */
     footerBtnSize?: 'xs' | 'sm' | 'md' | 'lg';
-    activeToggaleColumns: Array<IColumn>;
+    activeToggaleColumns: Array<IColumn | IColumnV2>;
     onColumnToggle: (columns: Array<IColumn>) => void;
     modalContainer?: () => HTMLElement;
 }

package/lib/renderers/Table/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -12,8 +12,8 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var Sortable = require('sortablejs');
 var cloneDeep = require('lodash/cloneDeep');
-var amisUi = require('amis-ui');
 var amisCore = require('amis-core');
+var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -169,8 +169,8 @@ var ColumnToggler = /** @class */ (function (_super) {
             return (React__default["default"].createElement("ul", { className: cx('ColumnToggler-menu'), onClick: closeOnClick ? _this.close : amisCore.noop, ref: ref }, children));
         }));
         if (popOverContainer) {
-            return (React__default["default"].createElement(amisUi.Overlay, { container: popOverContainer, target: function () { return _this.target; }, show: true },
-                React__default["default"].createElement(amisUi.PopOver, { overlay: true, onHide: this.close, classPrefix: ns, className: cx('ColumnToggler-popover'), style: { minWidth: (_a = this.target) === null || _a === void 0 ? void 0 : _a.offsetWidth } }, body)));
+            return (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer, target: function () { return _this.target; }, show: true },
+                React__default["default"].createElement(amisCore.PopOver, { overlay: true, onHide: this.close, classPrefix: ns, className: cx('ColumnToggler-popover'), style: { minWidth: (_a = this.target) === null || _a === void 0 ? void 0 : _a.offsetWidth } }, body)));
         }
         return body;
     };

package/lib/renderers/Table/HeadCellFilterDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -204,8 +204,8 @@ var HeadCellFilterDropDown = /** @class */ (function (_super) {
         return (React__default["default"].createElement("span", { className: cx("".concat(ns, "TableCell-filterBtn"), data && typeof data[name] !== 'undefined' ? 'is-active' : '') },
             React__default["default"].createElement("span", { onClick: this.open },
                 React__default["default"].createElement(amisUi.Icon, { icon: "column-filter", className: "icon" })),
-            isOpened ? (React__default["default"].createElement(amisUi.Overlay, { container: popOverContainer || (function () { return ReactDOM.findDOMNode(_this); }), placement: "left-bottom-left-top right-bottom-right-top", target: popOverContainer ? function () { return ReactDOM.findDOMNode(_this).parentNode; } : null, show: true },
-                React__default["default"].createElement(amisUi.PopOver, { classPrefix: ns, onHide: this.close, className: cx("".concat(ns, "TableCell-filterPopOver"), filterable.className), overlay: true }, filterOptions && filterOptions.length > 0 ? (React__default["default"].createElement("ul", { className: cx('DropDown-menu') },
+            isOpened ? (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer || (function () { return ReactDOM.findDOMNode(_this); }), placement: "left-bottom-left-top right-bottom-right-top", target: popOverContainer ? function () { return ReactDOM.findDOMNode(_this).parentNode; } : null, show: true },
+                React__default["default"].createElement(amisCore.PopOver, { classPrefix: ns, onHide: this.close, className: cx("".concat(ns, "TableCell-filterPopOver"), filterable.className), overlay: true }, filterOptions && filterOptions.length > 0 ? (React__default["default"].createElement("ul", { className: cx('DropDown-menu') },
                     !filterable.multiple
                         ? filterOptions.map(function (option, index) { return (React__default["default"].createElement("li", { key: index, className: cx({
                                 'is-active': option.selected

package/lib/renderers/Table/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -10,8 +10,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var amisUi = require('amis-ui');
-var ReactDOM = require('react-dom');
 var amisCore = require('amis-core');
+var ReactDOM = require('react-dom');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -188,8 +188,8 @@ var HeadCellSearchDropDown = /** @class */ (function (_super) {
         return (React__default["default"].createElement("span", { className: cx("".concat(ns, "TableCell-searchBtn"), isActive ? 'is-active' : '') },
             React__default["default"].createElement("span", { onClick: this.open },
                 React__default["default"].createElement(amisUi.Icon, { icon: "search", className: "icon" })),
-            this.state.isOpened ? (React__default["default"].createElement(amisUi.Overlay, { container: popOverContainer || (function () { return ReactDOM.findDOMNode(_this); }), placement: "left-bottom-left-top right-bottom-right-top", target: popOverContainer ? function () { return ReactDOM.findDOMNode(_this).parentNode; } : null, show: true },
-                React__default["default"].createElement(amisUi.PopOver, { classPrefix: ns, onHide: this.close, className: cx("".concat(ns, "TableCell-searchPopOver"), searchable.className), overlay: true }, render('quick-search-form', formSchema, {
+            this.state.isOpened ? (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer || (function () { return ReactDOM.findDOMNode(_this); }), placement: "left-bottom-left-top right-bottom-right-top", target: popOverContainer ? function () { return ReactDOM.findDOMNode(_this).parentNode; } : null, show: true },
+                React__default["default"].createElement(amisCore.PopOver, { classPrefix: ns, onHide: this.close, className: cx("".concat(ns, "TableCell-searchPopOver"), searchable.className), overlay: true }, render('quick-search-form', formSchema, {
                     data: tslib.__assign(tslib.__assign({}, data), { orderBy: orderBy, orderDir: orderBy === name ? store.orderDir : '' }),
                     onSubmit: this.handleSubmit,
                     onAction: this.handleAction

package/lib/renderers/Table/ItemActionsWrapper.js

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

package/lib/renderers/Table/TableBody.js

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

package/lib/renderers/Table/TableCell.js

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

package/lib/renderers/Table/TableContent.js

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

package/lib/renderers/Table/TableRow.js

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

package/lib/renderers/Table/exportExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -40,7 +40,7 @@ function exportExcel(ExcelJS, props, toolbar) {
         return tslib.__generator(this, function (_h) {
             switch (_h.label) {
                 case 0:
-                    store = props.store, env = props.env, __ = props.translate, data = props.data;
+                    store = props.store, env = props.env, props.classnames, __ = props.translate, data = props.data;
                     columns = store.exportColumns || [];
                     rows = [];
                     filename = 'data';
@@ -149,7 +149,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                         }
                     }
                     type = column.type || 'plain';
-                    if (!(type === 'image' && value)) return [3 /*break*/, 11];
+                    if (!((type === 'image' || type === 'static-image') && value)) return [3 /*break*/, 11];
                     _h.label = 6;
                 case 6:
                     _h.trys.push([6, 9, , 10]);
@@ -207,7 +207,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     return [3 /*break*/, 10];
                 case 10: return [3 /*break*/, 17];
                 case 11:
-                    if (!(type == 'link')) return [3 /*break*/, 12];
+                    if (!(type == 'link' || type === 'static-link')) return [3 /*break*/, 12];
                     href = column.pristine.href;
                     linkURL = (typeof href === 'string' && href
                         ? amisCore.filter(href, rowData, '| raw')
@@ -223,7 +223,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     };
                     return [3 /*break*/, 17];
                 case 12:
-                    if (!(type === 'mapping')) return [3 /*break*/, 16];
+                    if (!(type === 'mapping' || type === 'static-mapping')) return [3 /*break*/, 16];
                     map = column.pristine.map;
                     source = column.pristine.source;
                     if (!source) return [3 /*break*/, 15];
@@ -257,7 +257,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     }
                     return [3 /*break*/, 17];
                 case 16:
-                    if (type === 'date') {
+                    if (type === 'date' || type === 'static-date') {
                         viewValue = void 0;
                         _e = column.pristine, fromNow = _e.fromNow, _f = _e.format, format = _f === void 0 ? 'YYYY-MM-DD' : _f, _g = _e.valueFormat, valueFormat = _g === void 0 ? 'X' : _g;
                         if (value) {

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

@@ -366,5 +366,6 @@ export default class Table extends React.Component<TableProps, object> {
 }
 export declare class TableRenderer extends Table {
     receive(values: any, subPath?: string): void;
+    reload(subPath?: string, query?: any, ctx?: any): void;
 }
 export { TableCell };

package/lib/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 
@@ -1518,6 +1518,20 @@ var Table = /** @class */ (function (_super) {
             return scoped.send(subPath, values);
         }
     };
+    TableRenderer.prototype.reload = function (subPath, query, ctx) {
+        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();
+        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.reload) === null || _b === void 0 ? void 0 : _b.call(crud, subPath, query, ctx);
+        }
+        if (subPath) {
+            return scoped.reload(subPath, ctx);
+        }
+    };
     TableRenderer = tslib.__decorate([
         amisCore.Renderer({
             type: 'table',

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

@@ -1,3 +1,19 @@
-import ColumnToggler from '../Table/ColumnToggler';
-export declare class ColumnTogglerRenderer extends ColumnToggler {
+import React from 'react';
+import { ColumnTogglerProps } from '../Table/ColumnToggler';
+import { BaseSchema } from '../../Schema';
+export interface ColumnTogglerSchema extends BaseSchema {
+    label?: string;
+    tooltip?: string;
+    size?: string;
+    icon?: string;
+    draggable?: boolean;
+    align?: string;
+}
+export interface ColumnTogglerRendererProps extends ColumnTogglerProps {
+    toggleAllColumns?: Function;
+    toggleToggle?: Function;
+    cols: Array<any>;
+}
+export declare class ColumnTogglerRenderer extends React.Component<ColumnTogglerRendererProps> {
+    render(): JSX.Element | null;
 }

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

@@ -1,19 +1,89 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * 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.10
+ * amis v2.0.0-rc.16
  * Copyright 2018-2022 baidu
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.10
+ * amis v2.0.0-rc.16
  * 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;
+}