amis 2.0.1 → 2.1.1-beta.2

package/lib/renderers/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -20,10 +20,15 @@ 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 sourceResult = amisCore.resolveVariableAndFilter(source, data, '| raw');
+    /** 步骤数据源 */
     var stepsRow = (Array.isArray(sourceResult) ? sourceResult : undefined) ||
         config ||
         steps ||
         [];
+    /** 状态数据源 */
+    var statusValue = amisCore.isPureVariable(status)
+        ? amisCore.resolveVariableAndFilter(status, data, '| raw')
+        : status;
     var resolveRender = function (val) {
         return typeof val === 'string' ? amisCore.filter(val, data) : val && render('inner', val);
     };
@@ -39,19 +44,18 @@ function StepsCmpt(props) {
     });
     function getStepStatus(step, i) {
         var stepStatus;
-        if (typeof status === 'string') {
+        if (typeof statusValue === 'string') {
             if (i === currentValue) {
-                var resolveStatus = amisCore.resolveVariable(status, data);
-                stepStatus = resolveStatus || status || amisUi.StepStatus.process;
+                stepStatus = statusValue || status || amisUi.StepStatus.process;
             }
         }
-        else if (typeof status === 'object') {
+        else if (typeof statusValue === 'object') {
             var key = step.value;
-            key && status[key] && (stepStatus = status[key]);
+            key && statusValue[key] && (stepStatus = statusValue[key]);
         }
         return stepStatus;
     }
-    return (React__default["default"].createElement(amisUi.Steps, { current: currentValue, steps: resolveSteps, className: className, status: status, mode: mode, progressDot: progressDot, labelPlacement: labelPlacement, useMobileUI: useMobileUI }));
+    return (React__default["default"].createElement(amisUi.Steps, { current: currentValue, steps: resolveSteps, className: className, status: statusValue, mode: mode, progressDot: progressDot, labelPlacement: labelPlacement, useMobileUI: useMobileUI }));
 }
 var StepsWithRemoteConfig = amisUi.withRemoteConfig({
     adaptor: function (data) { return data.steps || data; }

package/lib/renderers/Table/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/HeadCellFilterDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -185,7 +185,7 @@ var HeadCellSearchDropDown = /** @class */ (function (_super) {
         var _a = this.props, render = _a.render, name = _a.name, data = _a.data, searchable = _a.searchable, store = _a.store, orderBy = _a.orderBy, popOverContainer = _a.popOverContainer, ns = _a.classPrefix, cx = _a.classnames;
         var formSchema = this.buildSchema();
         var isActive = this.isActive();
-        return (React__default["default"].createElement("span", { className: cx("".concat(ns, "TableCell-searchBtn"), isActive ? 'is-active' : '') },
+        return (React__default["default"].createElement("span", { className: cx("".concat(ns, "TableCell-searchBtn"), isActive ? 'is-active' : '', this.state.isOpened ? 'is-opened' : '') },
             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(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 },

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ITableStore } from 'amis-core';
 import { ClassNamesFn } from 'amis-core';
 export interface ItemActionsProps {

package/lib/renderers/Table/ItemActionsWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/TableBody.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

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

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

package/lib/renderers/Table/TableContent.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -49,7 +49,19 @@ var TableContent = /** @class */ (function (_super) {
             store.hoverRow ? this.renderItemActions() : null,
             React__default["default"].createElement("table", { ref: tableRef, className: tableClassName },
                 React__default["default"].createElement("thead", null,
-                    columnsGroup.length ? (React__default["default"].createElement("tr", null, columnsGroup.map(function (item, index) { return (React__default["default"].createElement("th", { key: index, "data-index": item.index, colSpan: item.colSpan, rowSpan: item.rowSpan }, item.label ? render('tpl', item.label) : null)); }))) : null,
+                    columnsGroup.length ? (React__default["default"].createElement("tr", null, columnsGroup.map(function (item, index) {
+                        /**
+                         * 勾选列和展开列的表头单独成列
+                         * 如果分组列只有一个元素，也要执行表头合并
+                         */
+                        return !!~['__checkme', '__expandme'].indexOf(item.has[0].type) ||
+                            (item.has.length === 1 && !/^__/.test(item.has[0].type)) ? (renderHeadCell(item.has[0], {
+                            'data-index': item.has[0].index,
+                            'key': index,
+                            'colSpan': item.colSpan,
+                            'rowSpan': item.rowSpan
+                        })) : (React__default["default"].createElement("th", { key: index, "data-index": item.index, colSpan: item.colSpan, rowSpan: item.rowSpan }, item.label ? render('tpl', item.label) : null));
+                    }))) : null,
                     React__default["default"].createElement("tr", { className: hideHeader ? 'fake-hide' : '' }, columns.map(function (column) {
                         var _a;
                         return ((_a = columnsGroup.find(function (group) { return ~group.has.indexOf(column); })) === null || _a === void 0 ? void 0 : _a.rowSpan) === 2

package/lib/renderers/Table/TableRow.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/exportExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

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

@@ -317,6 +317,9 @@ export default class Table extends React.Component<TableProps, object> {
     reset(): void;
     bulkUpdate(value: any, items: Array<object>): void;
     getSelected(): any[];
+    /**
+     * 滚动重新定位Table-fixedTop
+     */
     affixDetect(): void;
     updateTableInfo(): void;
     handleOutterScroll(): void;

package/lib/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -132,7 +132,13 @@ var Table = /** @class */ (function (_super) {
         return updateRows;
     };
     Table.prototype.componentDidMount = function () {
-        var parent = amisCore.getScrollParent(ReactDOM.findDOMNode(this));
+        var _a = this.props, autoFillHeight = _a.autoFillHeight, ns = _a.classPrefix;
+        var currentNode = ReactDOM.findDOMNode(this);
+        // 获取小于所有子元素高度之和的父元素
+        var parent = amisCore.getScrollParent(currentNode, function (parent) {
+            // 具备 overflow-*:auto 的父元素的高度小于当前元素
+            return (parent.offsetHeight > 0 && parent.offsetHeight < parent.scrollHeight);
+        });
         if (!parent || parent === document.body) {
             parent = window;
         }
@@ -144,10 +150,15 @@ var Table = /** @class */ (function (_super) {
         }
         this.affixDetect();
         parent.addEventListener('scroll', this.affixDetect);
+        if (autoFillHeight) {
+            document
+                .querySelector(".".concat(ns, "Table-content"))
+                .addEventListener('scroll', this.affixDetect);
+        }
         window.addEventListener('resize', this.affixDetect);
         this.updateAutoFillHeight();
         window.addEventListener('resize', this.updateAutoFillHeight);
-        var _a = this.props, store = _a.store, autoGenerateFilter = _a.autoGenerateFilter, onSearchableFromInit = _a.onSearchableFromInit;
+        var _b = this.props, store = _b.store, autoGenerateFilter = _b.autoGenerateFilter, onSearchableFromInit = _b.onSearchableFromInit;
         // autoGenerateFilter 开启后
         // 如果没有一个 searchable 的 column crud 就不会初始化加载
         // 所以这里加个判断默认初始加载一次
@@ -278,9 +289,14 @@ var Table = /** @class */ (function (_super) {
         this.updateTableInfoLazy();
     };
     Table.prototype.componentWillUnmount = function () {
-        var formItem = this.props.formItem;
+        var _a = this.props, formItem = _a.formItem, autoFillHeight = _a.autoFillHeight, ns = _a.classPrefix;
         var parent = this.parentNode;
         parent && parent.removeEventListener('scroll', this.affixDetect);
+        if (autoFillHeight) {
+            document
+                .querySelector(".".concat(ns, "Table-content"))
+                .addEventListener('scroll', this.affixDetect);
+        }
         window.removeEventListener('resize', this.affixDetect);
         window.removeEventListener('resize', this.updateAutoFillHeight);
         this.updateTableInfoLazy.cancel();
@@ -477,24 +493,51 @@ var Table = /** @class */ (function (_super) {
         var store = this.props.store;
         return store.selectedRows.map(function (item) { return item.data; });
     };
+    /**
+     * 滚动重新定位Table-fixedTop
+     */
     Table.prototype.affixDetect = function () {
-        var _a, _b, _c, _d;
-        if (!this.props.affixHeader || !this.table || this.props.autoFillHeight) {
+        var _a, _b, _c;
+        var _d = this.props, affixHeader = _d.affixHeader, ns = _d.classPrefix, affixOffsetTop = _d.affixOffsetTop, env = _d.env, autoFillHeight = _d.autoFillHeight;
+        if (!(affixHeader || autoFillHeight) || !this.table) {
+            // if (!this.props.affixHeader || !this.table || this.props.autoFillHeight) {
             return;
         }
-        var ns = this.props.classPrefix;
         var dom = ReactDOM.findDOMNode(this);
-        var clip = this.table.getBoundingClientRect();
-        var offsetY = (_b = (_a = this.props.affixOffsetTop) !== null && _a !== void 0 ? _a : this.props.env.affixOffsetTop) !== null && _b !== void 0 ? _b : 0;
-        var headingHeight = ((_c = dom.querySelector(".".concat(ns, "Table-heading"))) === null || _c === void 0 ? void 0 : _c.getBoundingClientRect().height) || 0;
-        var headerHeight = ((_d = dom.querySelector(".".concat(ns, "Table-headToolbar"))) === null || _d === void 0 ? void 0 : _d.getBoundingClientRect().height) || 0;
-        var affixed = clip.top - headerHeight - headingHeight < offsetY &&
-            clip.top + clip.height - 40 > offsetY;
+        var headerHeight = ((_a = dom.querySelector(".".concat(ns, "Table-headToolbar"))) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect().height) || 0;
         var affixedDom = dom.querySelector(".".concat(ns, "Table-fixedTop"));
-        affixedDom.style.cssText += "top: ".concat(offsetY, "px;width: ").concat(this.table.parentNode.offsetWidth, "px");
-        affixed
-            ? affixedDom.classList.add('in')
-            : affixedDom.classList.remove('in');
+        var affixedDomHeight = getComputedStyle(affixedDom).getPropertyValue('height');
+        if (autoFillHeight) {
+            //! 解决 sticky 不兼容的问题
+            var tableContentDom = document.querySelector(".".concat(ns, "Table-content"));
+            var clip = tableContentDom.getBoundingClientRect();
+            var tableHeaderClip = affixedDom
+                .querySelector(".".concat(ns, "Table-wrapper"))
+                .getBoundingClientRect();
+            var offsetHeight = affixedDom.getBoundingClientRect().height - tableHeaderClip.height;
+            var offsetY = clip.top - offsetHeight;
+            affixedDom.style.cssText += "top: ".concat(offsetY, "px;width: ").concat(clip.width, "px");
+            affixedDom.classList.add('in');
+        }
+        else {
+            // 配置了 affixHeader
+            var clip = this.table.getBoundingClientRect();
+            var offsetY = (_b = affixOffsetTop !== null && affixOffsetTop !== void 0 ? affixOffsetTop : env.affixOffsetTop) !== null && _b !== void 0 ? _b : 0;
+            var headingHeight = ((_c = dom.querySelector(".".concat(ns, "Table-heading"))) === null || _c === void 0 ? void 0 : _c.getBoundingClientRect().height) || 0;
+            var affixedShadowDom = dom.querySelector(".".concat(ns, "Table-fixedTop-shadow"));
+            var affixed = clip.top - headerHeight - headingHeight < offsetY &&
+                clip.top + clip.height - 40 > offsetY;
+            affixedDom.style.cssText += "top: ".concat(offsetY, "px;width: ").concat(this.table.parentNode.offsetWidth, "px");
+            affixedShadowDom.style.cssText += "top: ".concat(affixedDomHeight, ";width: ").concat(this.table.parentNode.offsetWidth, "px");
+            var preStatus = affixedDom.classList.contains('in');
+            affixed
+                ? affixedDom.classList.add('in')
+                : affixedDom.classList.remove('in');
+            // 出现affixHeader时重新计算列表宽度
+            if (!preStatus && affixed) {
+                this.updateTableInfoLazy();
+            }
+        }
         // store.markHeaderAffix(clip.top < offsetY && (clip.top + clip.height - 40) > offsetY);
     };
     Table.prototype.updateTableInfo = function () {
@@ -1051,7 +1094,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', {
@@ -1073,7 +1116,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 || item.checkable, 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, {
@@ -1113,31 +1156,33 @@ var Table = /** @class */ (function (_super) {
         var _a = this.props, store = _a.store, affixHeader = _a.affixHeader, render = _a.render, cx = _a.classnames;
         var hideHeader = store.filteredColumns.every(function (column) { return !column.label; });
         var columnsGroup = store.columnGroup;
-        return affixHeader ? (React__default["default"].createElement("div", { className: cx('Table-fixedTop', {
-                'is-fakeHide': hideHeader
-            }) },
-            this.renderHeader(false),
-            this.renderHeading(),
-            React__default["default"].createElement("div", { className: cx('Table-fixedLeft') }, store.leftFixedColumns.length
-                ? this.renderFixedColumns(store.rows, store.leftFixedColumns, true, tableClassName)
-                : null),
-            React__default["default"].createElement("div", { className: cx('Table-fixedRight') }, store.rightFixedColumns.length
-                ? this.renderFixedColumns(store.rows, store.rightFixedColumns, true, tableClassName)
-                : null),
-            React__default["default"].createElement("div", { className: cx('Table-wrapper') },
-                React__default["default"].createElement("table", { ref: this.affixedTableRef, className: tableClassName },
-                    React__default["default"].createElement("colgroup", null, store.filteredColumns.map(function (column) { return (React__default["default"].createElement("col", { key: column.index, "data-index": column.index })); })),
-                    React__default["default"].createElement("thead", null,
-                        columnsGroup.length ? (React__default["default"].createElement("tr", null, columnsGroup.map(function (item, index) { return (React__default["default"].createElement("th", { key: index, "data-index": item.index, colSpan: item.colSpan, rowSpan: item.rowSpan }, item.label ? render('tpl', item.label) : null)); }))) : null,
-                        React__default["default"].createElement("tr", null, store.filteredColumns.map(function (column) {
-                            var _a;
-                            return ((_a = columnsGroup.find(function (group) { return ~group.has.indexOf(column); })) === null || _a === void 0 ? void 0 : _a.rowSpan) === 2
-                                ? null
-                                : _this.renderHeadCell(column, {
-                                    'key': column.index,
-                                    'data-index': column.index
-                                });
-                        }))))))) : null;
+        return affixHeader ? (React__default["default"].createElement(React__default["default"].Fragment, null,
+            React__default["default"].createElement("div", { className: cx('Table-fixedTop', {
+                    'is-fakeHide': hideHeader
+                }) },
+                this.renderHeader(false),
+                this.renderHeading(),
+                React__default["default"].createElement("div", { className: cx('Table-fixedLeft') }, store.leftFixedColumns.length
+                    ? this.renderFixedColumns(store.rows, store.leftFixedColumns, true, tableClassName)
+                    : null),
+                React__default["default"].createElement("div", { className: cx('Table-fixedRight') }, store.rightFixedColumns.length
+                    ? this.renderFixedColumns(store.rows, store.rightFixedColumns, true, tableClassName)
+                    : null),
+                React__default["default"].createElement("div", { className: cx('Table-wrapper') },
+                    React__default["default"].createElement("table", { ref: this.affixedTableRef, className: tableClassName },
+                        React__default["default"].createElement("colgroup", null, store.filteredColumns.map(function (column) { return (React__default["default"].createElement("col", { key: column.index, "data-index": column.index })); })),
+                        React__default["default"].createElement("thead", null,
+                            columnsGroup.length ? (React__default["default"].createElement("tr", null, columnsGroup.map(function (item, index) { return (React__default["default"].createElement("th", { key: index, "data-index": item.index, colSpan: item.colSpan, rowSpan: item.rowSpan }, item.label ? render('tpl', item.label) : null)); }))) : null,
+                            React__default["default"].createElement("tr", null, store.filteredColumns.map(function (column) {
+                                var _a;
+                                return ((_a = columnsGroup.find(function (group) { return ~group.has.indexOf(column); })) === null || _a === void 0 ? void 0 : _a.rowSpan) === 2
+                                    ? null
+                                    : _this.renderHeadCell(column, {
+                                        'key': column.index,
+                                        'data-index': column.index
+                                    });
+                            })))))),
+            React__default["default"].createElement("div", { className: cx('Table-fixedTop-shadow') }))) : null;
     };
     Table.prototype.renderFixedColumns = function (rows, columns, headerOnly, tableClassName) {
         var _this = this;
@@ -1146,7 +1191,9 @@ var Table = /** @class */ (function (_super) {
         var _a = this.props, placeholder = _a.placeholder, store = _a.store, cx = _a.classnames, render = _a.render, data = _a.data, translate = _a.translate, locale = _a.locale, checkOnItemClick = _a.checkOnItemClick, buildItemProps = _a.buildItemProps, rowClassNameExpr = _a.rowClassNameExpr, rowClassName = _a.rowClassName, itemAction = _a.itemAction, dispatchEvent = _a.dispatchEvent, onEvent = _a.onEvent;
         var hideHeader = store.filteredColumns.every(function (column) { return !column.label; });
         var columnsGroup = store.columnGroup;
-        return (React__default["default"].createElement("table", { className: cx('Table-table', store.combineNum > 0 ? 'Table-table--withCombine' : '', tableClassName) },
+        return (React__default["default"].createElement("table", { className: cx('Table-table', tableClassName, {
+                'Table-table--withCombine': store.combineNum > 0
+            }) },
             React__default["default"].createElement("thead", null,
                 columnsGroup.length ? (React__default["default"].createElement("tr", null, columnsGroup.map(function (item, index) {
                     var renderColumns = columns.filter(function (a) { return ~item.has.indexOf(a); });
@@ -1163,7 +1210,9 @@ var Table = /** @class */ (function (_super) {
                 }))),
             headerOnly ? null : !rows.length ? (React__default["default"].createElement("tbody", null,
                 React__default["default"].createElement("tr", { className: cx('Table-placeholder') },
-                    React__default["default"].createElement("td", { colSpan: columns.length }, render('placeholder', translate(placeholder || 'placeholder.noData')))))) : (React__default["default"].createElement(TableBody.TableBody, { tableClassName: cx(store.combineNum > 0 ? 'Table-table--withCombine' : '', tableClassName), itemAction: itemAction, classnames: cx, render: render, renderCell: this.renderCell, onCheck: this.handleCheck, onQuickChange: store.dragging ? undefined : this.handleQuickChange, footable: store.footable, ignoreFootableContent: true, footableColumns: store.footableColumns, checkOnItemClick: checkOnItemClick, buildItemProps: buildItemProps, onAction: this.handleAction, rowClassNameExpr: rowClassNameExpr, rowClassName: rowClassName, columns: columns, rows: rows, locale: locale, translate: translate, rowsProps: {
+                    React__default["default"].createElement("td", { colSpan: columns.length }, render('placeholder', translate(placeholder || 'placeholder.noData')))))) : (React__default["default"].createElement(TableBody.TableBody, { tableClassName: cx(tableClassName, {
+                    'Table-table--withCombine': store.combineNum > 0
+                }), itemAction: itemAction, classnames: cx, render: render, renderCell: this.renderCell, onCheck: this.handleCheck, onQuickChange: store.dragging ? undefined : this.handleQuickChange, footable: store.footable, ignoreFootableContent: true, footableColumns: store.footableColumns, checkOnItemClick: checkOnItemClick, buildItemProps: buildItemProps, onAction: this.handleAction, rowClassNameExpr: rowClassNameExpr, rowClassName: rowClassName, columns: columns, rows: rows, locale: locale, translate: translate, rowsProps: {
                     regionPrefix: 'fixed/',
                     renderCell: function (region, column, item, props) { return _this.renderCell(region, column, item, props, true); },
                     data: data,
@@ -1358,7 +1407,10 @@ var Table = /** @class */ (function (_super) {
         // 不过目前看来只有这样写它才会重新更新视图
         store.rows.length;
         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(TableContent.TableContent, { tableClassName: cx({
+                    'Table-table--checkOnItemClick': checkOnItemClick,
+                    'Table-table--withCombine': store.combineNum > 0
+                }, 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) {
@@ -1398,7 +1450,9 @@ var Table = /** @class */ (function (_super) {
         var heading = this.renderHeading();
         var header = this.renderHeader();
         var footer = this.renderFooter();
-        var tableClassName = cx('Table-table', store.combineNum > 0 ? 'Table-table--withCombine' : '', this.props.tableClassName);
+        var tableClassName = cx('Table-table', this.props.tableClassName, {
+            'Table-table--withCombine': store.combineNum > 0
+        });
         return (React__default["default"].createElement("div", { className: cx('Table', className, {
                 'Table--unsaved': !!store.modified || !!store.moved,
                 'Table--autoFillHeight': autoFillHeight

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

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/TableView.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 
@@ -25,13 +25,13 @@ var TableView = /** @class */ (function (_super) {
         return _super.call(this, props) || this;
     }
     TableView.prototype.renderTd = function (td, colIndex, rowIndex) {
-        var _a = this.props, border = _a.border, borderColor = _a.borderColor; _a.render; var style = _a.style, padding = _a.padding;
+        var _a = this.props, border = _a.border, borderColor = _a.borderColor; _a.render; _a.style; var padding = _a.padding;
         var key = "td-".concat(colIndex);
         var styleBorder;
         if (border) {
             styleBorder = "1px solid ".concat(borderColor);
         }
-        return (React__default["default"].createElement("td", { style: tslib.__assign({ border: styleBorder, color: td.color, fontWeight: td.bold ? 'bold' : 'normal', background: td.background, padding: td.padding || padding, width: td.width || 'auto', textAlign: td.align || 'left', verticalAlign: td.valign || 'center' }, style), align: td.align, valign: td.valign, rowSpan: td.rowspan, colSpan: td.colspan, key: key }, this.renderTdBody(td.body)));
+        return (React__default["default"].createElement("td", { style: tslib.__assign({ border: styleBorder, color: td.color, fontWeight: td.bold ? 'bold' : 'normal', background: td.background, padding: td.padding || padding, width: td.width || 'auto', textAlign: td.align || 'left', verticalAlign: td.valign || 'center' }, td.style), align: td.align, valign: td.valign, rowSpan: td.rowspan, colSpan: td.colspan, key: key }, this.renderTdBody(td.body)));
     };
     TableView.prototype.renderTdBody = function (body) {
         var render = this.props.render;
@@ -39,7 +39,10 @@ var TableView = /** @class */ (function (_super) {
     };
     TableView.prototype.renderTds = function (tds, rowIndex) {
         var _this = this;
-        return tds.map(function (td, colIndex) { return _this.renderTd(td, colIndex, rowIndex); });
+        var data = this.props.data;
+        return tds.map(function (td, colIndex) {
+            return _this.renderTd(amisCore.resolveMappingObject(td, data), colIndex, rowIndex);
+        });
     };
     TableView.prototype.renderTr = function (tr, rowIndex) {
         var key = "tr-".concat(rowIndex);
@@ -47,13 +50,17 @@ var TableView = /** @class */ (function (_super) {
     };
     TableView.prototype.renderTrs = function (trs) {
         var _this = this;
-        var tr = trs.map(function (tr, rowIndex) { return _this.renderTr(tr, rowIndex); });
+        var data = this.props.data;
+        var tr = trs.map(function (tr, rowIndex) {
+            return _this.renderTr(amisCore.resolveMappingObject(tr, data), rowIndex);
+        });
         return tr;
     };
     TableView.prototype.renderCols = function () {
-        var cols = this.props.cols;
+        var _a = this.props, cols = _a.cols, data = _a.data;
         if (cols) {
             var colsElement = cols.map(function (col) {
+                col = amisCore.resolveMappingObject(col, data);
                 return React__default["default"].createElement("col", { span: col.span, style: col.style });
             });
             return React__default["default"].createElement("colgroup", null, colsElement);
@@ -69,12 +76,8 @@ var TableView = /** @class */ (function (_super) {
         return null;
     };
     TableView.prototype.render = function () {
-        var _a = this.props, width = _a.width, border = _a.border, borderColor = _a.borderColor, trs = _a.trs, cx = _a.classnames, className = _a.className;
-        var styleBorder;
-        if (border) {
-            styleBorder = "1px solid ".concat(borderColor);
-        }
-        return (React__default["default"].createElement("table", { className: cx('TableView', className), style: { width: width, border: styleBorder, borderCollapse: 'collapse' } },
+        var _a = this.props, width = _a.width, trs = _a.trs, cx = _a.classnames, className = _a.className;
+        return (React__default["default"].createElement("table", { className: cx('TableView', className), style: { width: width, borderCollapse: 'collapse' } },
             this.renderCaption(),
             this.renderCols(),
             React__default["default"].createElement("tbody", null, this.renderTrs(trs))));
@@ -94,7 +97,8 @@ var TableView = /** @class */ (function (_super) {
     }
     TableViewRenderer = tslib.__decorate([
         amisCore.Renderer({
-            type: 'table-view'
+            type: 'table-view',
+            autoVar: true
         })
     ], TableViewRenderer);
     return TableViewRenderer;

package/lib/renderers/Tabs.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tasks.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Timeline.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/TooltipWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/VBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Video.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/WebComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Wizard.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.1
+ * amis v2.1.1-beta.2
  * Copyright 2018-2022 baidu
  */