amis 2.0.0-rc.9 → 2.0.2

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: ("focus" | "hover" | "click")[];
     };
     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.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/SearchBox.js

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

package/lib/renderers/Service.js

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

package/lib/renderers/SparkLine.js

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

package/lib/renderers/Spinner.js

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

package/lib/renderers/Status.js

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

package/lib/renderers/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * 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.9
+ * amis v2.0.2
  * 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.9
+ * amis v2.0.2
  * 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.9
+ * amis v2.0.2
  * 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.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/TableBody.js

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

package/lib/renderers/Table/TableCell.js

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

package/lib/renderers/Table/TableContent.js

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

package/lib/renderers/Table/TableRow.js

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

package/lib/renderers/Table/exportExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * 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

@@ -277,6 +277,7 @@ export default class Table extends React.Component<TableProps, object> {
     affixedTable?: HTMLTableElement;
     parentNode?: HTMLElement | Window;
     lastScrollLeft: number;
+    lastScrollTop: number;
     totalWidth: number;
     totalHeight: number;
     outterWidth: number;
@@ -306,7 +307,7 @@ export default class Table extends React.Component<TableProps, object> {
     componentDidUpdate(prevProps: TableProps): void;
     componentWillUnmount(): void;
     subFormRef(form: any, x: number, y: number): void;
-    handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object): void;
+    handleAction(e: React.UIEvent<any> | undefined, action: ActionObject, ctx: object): void;
     handleCheck(item: IRow, value: boolean, shift?: boolean): Promise<void>;
     handleCheckAll(): Promise<void>;
     handleQuickChange(item: IRow, values: object, saveImmediately?: boolean | any, savePristine?: boolean, resetOnFailed?: boolean): void;
@@ -319,6 +320,7 @@ export default class Table extends React.Component<TableProps, object> {
     affixDetect(): void;
     updateTableInfo(): void;
     handleOutterScroll(): void;
+    handleFixedColumnsScroll(event: React.UIEvent<any>): void;
     tableRef(ref: HTMLTableElement): void;
     dragTipRef(ref: any): void;
     affixedTableRef(ref: HTMLTableElement): void;
@@ -366,5 +368,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.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -38,6 +38,7 @@ var Table = /** @class */ (function (_super) {
     function Table(props, context) {
         var _this = _super.call(this, props) || this;
         _this.lastScrollLeft = -1;
+        _this.lastScrollTop = 0;
         _this.totalWidth = 0;
         _this.totalHeight = 0;
         _this.outterWidth = 0;
@@ -170,6 +171,8 @@ var Table = /** @class */ (function (_super) {
         var tableContent = table.querySelector(".".concat(ns, "Table-content"));
         var tableContentWrap = table.querySelector(".".concat(ns, "Table-contentWrap"));
         var footToolbar = table.querySelector(".".concat(ns, "Table-footToolbar"));
+        var leftFixedColumns = table.querySelector(".".concat(ns, "Table-fixedLeft"));
+        var rightFixedColumns = table.querySelector(".".concat(ns, "Table-fixedRight"));
         if (!tableContent) {
             return;
         }
@@ -196,11 +199,21 @@ var Table = /** @class */ (function (_super) {
                 allParentPaddingButtom + paddingButtom + borderBottom;
             parentNode = parentNode.parentElement;
         }
-        tableContent.style.height = "".concat(viewportHeight -
+        var tableContentHeight = "".concat(viewportHeight -
             tableContentTop -
             tableContentWrapMarginButtom -
             footToolbarHeight -
             allParentPaddingButtom, "px");
+        tableContent.style.height = tableContentHeight;
+        /**autoFillHeight开启后固定列会溢出Table高度，需要同步一下 */
+        if (leftFixedColumns) {
+            leftFixedColumns.style.height = tableContentHeight;
+            leftFixedColumns.style.overflowY = 'auto';
+        }
+        if (rightFixedColumns) {
+            rightFixedColumns.style.height = tableContentHeight;
+            rightFixedColumns.style.overflowY = 'auto';
+        }
     };
     Table.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
@@ -555,34 +568,55 @@ var Table = /** @class */ (function (_super) {
     Table.prototype.handleOutterScroll = function () {
         var outter = this.table.parentNode;
         var scrollLeft = outter.scrollLeft;
-        if (scrollLeft === this.lastScrollLeft) {
-            return;
-        }
-        this.lastScrollLeft = scrollLeft;
-        var leading = scrollLeft === 0;
-        var trailing = Math.ceil(scrollLeft) + this.outterWidth >= this.totalWidth;
-        // console.log(scrollLeft, store.outterWidth, store.totalWidth, (scrollLeft + store.outterWidth) === store.totalWidth);
-        // store.setLeading(leading);
-        // store.setTrailing(trailing);
         var ns = this.props.classPrefix;
         var dom = ReactDOM.findDOMNode(this);
         var fixedLeft = dom.querySelectorAll(".".concat(ns, "Table-fixedLeft"));
-        if (fixedLeft && fixedLeft.length) {
-            for (var i = 0, len = fixedLeft.length; i < len; i++) {
-                var node = fixedLeft[i];
-                leading ? node.classList.remove('in') : node.classList.add('in');
+        var fixedRight = dom.querySelectorAll(".".concat(ns, "Table-fixedRight"));
+        if (scrollLeft !== this.lastScrollLeft) {
+            this.lastScrollLeft = scrollLeft;
+            var leading = scrollLeft === 0;
+            var trailing = Math.ceil(scrollLeft) + this.outterWidth >= this.totalWidth;
+            // console.log(scrollLeft, store.outterWidth, store.totalWidth, (scrollLeft + store.outterWidth) === store.totalWidth);
+            // store.setLeading(leading);
+            // store.setTrailing(trailing);
+            if (fixedLeft && fixedLeft.length) {
+                for (var i = 0, len = fixedLeft.length; i < len; i++) {
+                    var node = fixedLeft[i];
+                    leading ? node.classList.remove('in') : node.classList.add('in');
+                }
+            }
+            if (fixedRight && fixedRight.length) {
+                for (var i = 0, len = fixedRight.length; i < len; i++) {
+                    var node = fixedRight[i];
+                    trailing ? node.classList.remove('in') : node.classList.add('in');
+                }
+            }
+            var table = this.affixedTable;
+            if (table) {
+                table.style.cssText += "transform: translateX(-".concat(scrollLeft, "px)");
             }
         }
-        var fixedRight = dom.querySelectorAll(".".concat(ns, "Table-fixedRight"));
-        if (fixedRight && fixedRight.length) {
-            for (var i = 0, len = fixedRight.length; i < len; i++) {
-                var node = fixedRight[i];
-                trailing ? node.classList.remove('in') : node.classList.add('in');
+        /* 同步固定列内容的垂直滚动 */
+        if (outter.scrollTop !== this.lastScrollTop) {
+            this.lastScrollTop = outter.scrollTop;
+            if (fixedLeft && fixedLeft.length) {
+                forEach__default["default"](fixedLeft, function (node) { return node.scrollTo({ top: outter.scrollTop }); });
+            }
+            if (fixedRight && fixedRight.length) {
+                forEach__default["default"](fixedRight, function (node) { return node.scrollTo({ top: outter.scrollTop }); });
             }
         }
-        var table = this.affixedTable;
-        if (table) {
-            table.style.cssText += "transform: translateX(-".concat(scrollLeft, "px)");
+    };
+    Table.prototype.handleFixedColumnsScroll = function (event) {
+        /** table内容区当前Top */
+        var currentScrollTop = this.lastScrollTop;
+        /** 固定列的新Top */
+        var fixedScrollTop = event.currentTarget.scrollTop;
+        if (currentScrollTop !== fixedScrollTop) {
+            this.lastScrollTop = fixedScrollTop;
+            var tableContentDom = this.table
+                .parentNode;
+            tableContentDom.scrollTo({ top: fixedScrollTop });
         }
     };
     Table.prototype.tableRef = function (ref) {
@@ -800,7 +834,8 @@ var Table = /** @class */ (function (_super) {
     // 垂直线拖拽移动
     Table.prototype.handleColResizeMouseMove = function (e) {
         var moveX = e.clientX - this.lineStartX;
-        this.resizeLine.style.left = this.resizeLineLeft + moveX + 'px';
+        // 光标right为-4px，列宽改变时会自动跟随，不需要单独处理位置
+        // this.resizeLine.style.left = this.resizeLineLeft + moveX + 'px';
         this.targetTh.style.width = this.targetThWidth + moveX + 'px';
     };
     // 垂直线拖拽结束
@@ -1016,7 +1051,7 @@ var Table = /** @class */ (function (_super) {
                 'TableCell--filterable': column.filterable,
                 'Table-operationCell': column.type === 'operation'
             }) }),
-            React__default["default"].createElement("div", { className: cx("".concat(ns, "TableCell--title"), column.pristine.className, column.pristine.labelClassName) },
+            React__default["default"].createElement("div", { className: cx("".concat(ns, "TableCell--title"), column.pristine.className, column.pristine.labelClassName), style: props.style },
                 column.label ? render('tpl', column.label) : null,
                 column.remark
                     ? render('remark', {
@@ -1038,7 +1073,7 @@ var Table = /** @class */ (function (_super) {
         }
         if (column.type === '__checkme') {
             return (React__default["default"].createElement("td", { key: props.key, className: cx(column.pristine.className) },
-                React__default["default"].createElement(amisUi.Checkbox, { classPrefix: ns, type: multiple ? 'checkbox' : 'radio', checked: item.checked, disabled: item.checkdisable, onChange: checkOnItemClick ? amisCore.noop : this.handleCheck.bind(this, item) })));
+                React__default["default"].createElement(amisUi.Checkbox, { classPrefix: ns, type: multiple ? 'checkbox' : 'radio', checked: item.checked, disabled: item.checkdisable || !item.checkable, onChange: checkOnItemClick ? amisCore.noop : this.handleCheck.bind(this, item) })));
         }
         else if (column.type === '__dragme') {
             return (React__default["default"].createElement("td", { key: props.key, className: cx(column.pristine.className, {
@@ -1318,11 +1353,13 @@ var Table = /** @class */ (function (_super) {
             : footerNode || toolbarNode || null;
     };
     Table.prototype.renderTableContent = function () {
-        var _a = this.props, cx = _a.classnames, tableClassName = _a.tableClassName, store = _a.store, placeholder = _a.placeholder, render = _a.render, checkOnItemClick = _a.checkOnItemClick, buildItemProps = _a.buildItemProps, rowClassNameExpr = _a.rowClassNameExpr, rowClassName = _a.rowClassName, prefixRow = _a.prefixRow, locale = _a.locale, affixRow = _a.affixRow, tableContentClassName = _a.tableContentClassName, translate = _a.translate, itemAction = _a.itemAction; _a.affixRowClassNameExpr; var affixRowClassName = _a.affixRowClassName; _a.prefixRowClassNameExpr; var prefixRowClassName = _a.prefixRowClassName; _a.autoFillHeight; var itemActions = _a.itemActions, dispatchEvent = _a.dispatchEvent, onEvent = _a.onEvent, loading = _a.loading;
+        var _a = this.props, cx = _a.classnames, tableClassName = _a.tableClassName, store = _a.store, placeholder = _a.placeholder, render = _a.render, checkOnItemClick = _a.checkOnItemClick, buildItemProps = _a.buildItemProps, rowClassNameExpr = _a.rowClassNameExpr, rowClassName = _a.rowClassName, prefixRow = _a.prefixRow, locale = _a.locale, affixRow = _a.affixRow, tableContentClassName = _a.tableContentClassName, translate = _a.translate, itemAction = _a.itemAction; _a.affixRowClassNameExpr; var affixRowClassName = _a.affixRowClassName; _a.prefixRowClassNameExpr; var prefixRowClassName = _a.prefixRowClassName; _a.autoFillHeight; var itemActions = _a.itemActions, dispatchEvent = _a.dispatchEvent, onEvent = _a.onEvent, _b = _a.loading, loading = _b === void 0 ? false : _b;
         // 理论上来说 store.rows 应该也行啊
         // 不过目前看来只有这样写它才会重新更新视图
         store.rows.length;
-        return (React__default["default"].createElement(TableContent.TableContent, { tableClassName: cx(store.combineNum > 0 ? 'Table-table--withCombine' : '', { 'Table-table--checkOnItemClick': checkOnItemClick }, tableClassName), className: tableContentClassName, itemActions: itemActions, itemAction: itemAction, store: store, classnames: cx, columns: store.filteredColumns, columnsGroup: store.columnGroup, rows: store.rows, placeholder: placeholder, render: render, onMouseMove: this.handleMouseMove, onScroll: this.handleOutterScroll, tableRef: this.tableRef, renderHeadCell: this.renderHeadCell, renderCell: this.renderCell, onCheck: this.handleCheck, onQuickChange: store.dragging ? undefined : this.handleQuickChange, footable: store.footable, footableColumns: store.footableColumns, checkOnItemClick: checkOnItemClick, buildItemProps: buildItemProps, onAction: this.handleAction, rowClassNameExpr: rowClassNameExpr, rowClassName: rowClassName, data: store.data, prefixRow: prefixRow, affixRow: affixRow, prefixRowClassName: prefixRowClassName, affixRowClassName: affixRowClassName, locale: locale, translate: translate, dispatchEvent: dispatchEvent, onEvent: onEvent, loading: loading }));
+        return (React__default["default"].createElement(React__default["default"].Fragment, null,
+            React__default["default"].createElement(TableContent.TableContent, { tableClassName: cx(store.combineNum > 0 ? 'Table-table--withCombine' : '', { 'Table-table--checkOnItemClick': checkOnItemClick }, tableClassName), className: tableContentClassName, itemActions: itemActions, itemAction: itemAction, store: store, classnames: cx, columns: store.filteredColumns, columnsGroup: store.columnGroup, rows: store.rows, placeholder: placeholder, render: render, onMouseMove: this.handleMouseMove, onScroll: this.handleOutterScroll, tableRef: this.tableRef, renderHeadCell: this.renderHeadCell, renderCell: this.renderCell, onCheck: this.handleCheck, onQuickChange: store.dragging ? undefined : this.handleQuickChange, footable: store.footable, footableColumns: store.footableColumns, checkOnItemClick: checkOnItemClick, buildItemProps: buildItemProps, onAction: this.handleAction, rowClassNameExpr: rowClassNameExpr, rowClassName: rowClassName, data: store.data, prefixRow: prefixRow, affixRow: affixRow, prefixRowClassName: prefixRowClassName, affixRowClassName: affixRowClassName, locale: locale, translate: translate, dispatchEvent: dispatchEvent, onEvent: onEvent, loading: loading }),
+            React__default["default"].createElement(amisUi.Spinner, { overlay: true, show: loading })));
     };
     Table.prototype.doAction = function (action, args, throwErrors) {
         var _a = this.props, store = _a.store, valueField = _a.valueField, data = _a.data;
@@ -1350,6 +1387,9 @@ var Table = /** @class */ (function (_super) {
                 store.stopDragging();
                 store.toggleDragging();
                 break;
+            default:
+                this.handleAction(undefined, action, data);
+                break;
         }
     };
     Table.prototype.render = function () {
@@ -1367,10 +1407,14 @@ var Table = /** @class */ (function (_super) {
             header,
             heading,
             React__default["default"].createElement("div", { className: cx('Table-contentWrap'), onMouseLeave: this.handleMouseLeave },
-                React__default["default"].createElement("div", { className: cx('Table-fixedLeft'), onMouseMove: this.handleMouseMove }, affixColumns !== false && store.leftFixedColumns.length
+                React__default["default"].createElement("div", { className: cx('Table-fixedLeft', {
+                        'Table-fixedLeft--autoFillHeight': autoFillHeight
+                    }), onMouseMove: this.handleMouseMove, onScroll: this.handleFixedColumnsScroll }, affixColumns !== false && store.leftFixedColumns.length
                     ? this.renderFixedColumns(store.rows, store.leftFixedColumns, false, tableClassName)
                     : null),
-                React__default["default"].createElement("div", { className: cx('Table-fixedRight'), onMouseMove: this.handleMouseMove }, affixColumns !== false && store.rightFixedColumns.length
+                React__default["default"].createElement("div", { className: cx('Table-fixedRight', {
+                        'Table-fixedLeft--autoFillHeight': autoFillHeight
+                    }), onMouseMove: this.handleMouseMove, onScroll: this.handleFixedColumnsScroll }, affixColumns !== false && store.rightFixedColumns.length
                     ? this.renderFixedColumns(store.rows, store.rightFixedColumns, false, tableClassName)
                     : null),
                 this.renderTableContent()),
@@ -1445,6 +1489,12 @@ var Table = /** @class */ (function (_super) {
         canAccessSuperData: false,
         resizable: true
     };
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Table.prototype, "handleFixedColumnsScroll", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
@@ -1518,6 +1568,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;
 }