amis-ui 2.6.0 → 2.7.0

package/esm/components/menu/index.js

@@ -0,0 +1,315 @@
+/**
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
+ */
+
+import { __extends, __assign, __spreadArray, __awaiter, __generator, __decorate, __metadata } from 'tslib';
+import React__default from 'react';
+import uniq from 'lodash/uniq';
+import isEqual from 'lodash/isEqual';
+import isEqualWith from 'lodash/isEqualWith';
+import RcMenu, { Divider } from 'rc-menu';
+import ForwardOverflow from '../../node_modules/rc-overflow/es/Overflow.js';
+import { findTree, getTreeAncestors, mapTree, filterTree, autobind, themeable } from 'amis-core';
+import { getIcon } from '../icons.js';
+import MenuItem from './MenuItem.js';
+import SubMenu from './SubMenu.js';
+import { MenuContext } from './MenuContext.js';
+
+/**
+ * @file Menu
+ * @description 导航菜单，基于rc-menu实现：https://github.com/react-component/menu
+ * @author fex
+ */
+var CaretIcon = getIcon('caret');
+var Menu = /** @class */ (function (_super) {
+    __extends(Menu, _super);
+    function Menu(props) {
+        var _this = _super.call(this, props) || this;
+        var _a = _this.normalizeNavigations(__assign({}, props)), transformedNav = _a.transformedNav, activeKey = _a.activeKey, defaultOpenKeys = _a.defaultOpenKeys, openKeys = _a.openKeys;
+        _this.state = {
+            navigations: transformedNav,
+            activeKey: activeKey,
+            defaultOpenKeys: defaultOpenKeys,
+            openKeys: openKeys
+        };
+        return _this;
+    }
+    Menu.prototype.componentDidUpdate = function (prevProps, prevState) {
+        var props = this.props;
+        var isOpen = prevProps.isOpen;
+        if (!isEqualWith(prevProps.navigations, props.navigations, function (prev, cur) {
+            return isEqual(prev, cur);
+        }) ||
+            !isEqual(prevProps.location, props.location)) {
+            var _a = this.normalizeNavigations(__assign(__assign({}, props), { isOpen: isOpen })), transformedNav = _a.transformedNav, activeKey = _a.activeKey, defaultOpenKeys = _a.defaultOpenKeys, openKeys = _a.openKeys;
+            this.setState({
+                navigations: transformedNav,
+                activeKey: activeKey,
+                defaultOpenKeys: defaultOpenKeys,
+                openKeys: openKeys
+            });
+        }
+    };
+    Menu.prototype.getKeyPaths = function (navigations, key) {
+        var activeItem = findTree(navigations, function (item) { return item.id === key; });
+        if (!activeItem) {
+            return [];
+        }
+        var ancestors = getTreeAncestors(navigations, activeItem);
+        return ancestors ? ancestors.map(function (item) { return item.id || ''; }) : [];
+    };
+    Menu.prototype.normalizeNavigations = function (props) {
+        var _this = this;
+        var navigations = props.navigations, prefix = props.prefix, isActive = props.isActive, isOpen = props.isOpen, stacked = props.stacked;
+        var id = 1;
+        var activeKey = [];
+        var openKey = [];
+        var transformedNav = mapTree(filterTree(navigations, function (item, key, level) {
+            // 水平导航不需要分割线
+            if (!stacked && (item === null || item === void 0 ? void 0 : item.isDivider)) {
+                return false;
+            }
+            return true;
+        }), function (item, key, level, paths) {
+            // 如果没有传入key，则为导航加一个自增key
+            var navId = (item.id || item.key || id++).toString();
+            if (!activeKey.find(function (key) { return key === navId; }) && isActive(item, prefix)) {
+                activeKey === null || activeKey === void 0 ? void 0 : activeKey.push(navId);
+            }
+            var open = isOpen(item);
+            if (!openKey.find(function (key) { return key === navId; }) &&
+                !activeKey.find(function (key) { return key === navId; }) &&
+                open) {
+                openKey.push(navId);
+            }
+            return __assign(__assign({}, item), { id: navId, active: isActive, depth: level, children: item.children });
+        }, 1, false);
+        var activeKeyPaths = [];
+        activeKey.forEach(function (key) {
+            activeKeyPaths = __spreadArray(__spreadArray(__spreadArray([], activeKeyPaths, true), _this.getKeyPaths(transformedNav, key), true), [
+                key
+            ], false);
+        });
+        var openKeyPaths = [];
+        openKey.forEach(function (key) {
+            openKeyPaths = __spreadArray(__spreadArray(__spreadArray([], openKeyPaths, true), _this.getKeyPaths(transformedNav, key), true), [
+                key
+            ], false);
+        });
+        return {
+            transformedNav: transformedNav,
+            activeKey: activeKeyPaths,
+            defaultOpenKeys: activeKeyPaths,
+            openKeys: openKeyPaths
+        };
+    };
+    Menu.prototype.handleItemClick = function (_a) {
+        var key = _a.key, domEvent = _a.domEvent, keyPath = _a.keyPath;
+        return __awaiter(this, void 0, void 0, function () {
+            var onSelect, currentItem, result, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        // 菜单项里面可能会有按钮
+                        // 如果里面事件执行了e.preventDefault() 则不执行后面的
+                        if (domEvent && domEvent.defaultPrevented) {
+                            return [2 /*return*/];
+                        }
+                        onSelect = this.props.onSelect;
+                        currentItem = findTree(this.state.navigations, function (item) { return item.id === key; });
+                        _b = onSelect;
+                        if (!_b) return [3 /*break*/, 2];
+                        return [4 /*yield*/, onSelect((currentItem === null || currentItem === void 0 ? void 0 : currentItem.link) || currentItem, keyPath.length)];
+                    case 1:
+                        _b = (_c.sent());
+                        _c.label = 2;
+                    case 2:
+                        result = _b;
+                        if (result === false) {
+                            return [2 /*return*/];
+                        }
+                        this.setState({ activeKey: [key] });
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Menu.prototype.handleSubMenuTitleClick = function (_a) {
+        var key = _a.key, domEvent = _a.domEvent, props = _a.props;
+        if (domEvent && domEvent.defaultPrevented) {
+            return;
+        }
+        this.selectSubItem({ key: key, domEvent: domEvent, props: props });
+    };
+    Menu.prototype.selectSubItem = function (_a) {
+        var key = _a.key; _a.domEvent; _a.props;
+        var navigations = this.state.navigations;
+        var _b = this.props, stacked = _b.stacked, mode = _b.mode, collapsed = _b.collapsed, accordion = _b.accordion, onToggleExpand = _b.onToggleExpand, onToggle = _b.onToggle;
+        var isVericalInline = stacked && mode === 'inline' && !collapsed;
+        var openKeys = this.state.openKeys.concat();
+        var isOpen = openKeys.includes(key);
+        if (isOpen) {
+            openKeys = openKeys.filter(function (item) { return item !== key; });
+        }
+        else {
+            if (isVericalInline && accordion) {
+                var keyPaths = this.getKeyPaths(navigations, key);
+                openKeys = __spreadArray(__spreadArray([], keyPaths, true), [key], false);
+            }
+            else {
+                openKeys = __spreadArray(__spreadArray([], openKeys, true), [key], false);
+            }
+        }
+        var currentItem = findTree(navigations, function (item) { return item.id === key; });
+        // 因为Nav里只处理当前菜单项 因此新增一个onToggle事件
+        onToggle === null || onToggle === void 0 ? void 0 : onToggle(currentItem === null || currentItem === void 0 ? void 0 : currentItem.link, isOpen);
+        onToggleExpand === null || onToggleExpand === void 0 ? void 0 : onToggleExpand(uniq(openKeys));
+    };
+    Menu.prototype.handleToggleExpand = function (ctx) {
+        var navigations = this.state.navigations;
+        var _a = this.props, onToggleExpand = _a.onToggleExpand, stacked = _a.stacked, mode = _a.mode, collapsed = _a.collapsed, accordion = _a.accordion, onToggle = _a.onToggle;
+        var disabled = ctx.disabled, eventKey = ctx.eventKey, isOpen = ctx.isOpen, isSubMenu = ctx.isSubMenu;
+        var openKeys = this.state.openKeys.concat();
+        var isVericalInline = stacked && mode === 'inline' && !collapsed;
+        if (isSubMenu && !disabled) {
+            // isOpen是当前菜单的展开状态
+            if (isOpen) {
+                openKeys = openKeys.filter(function (key) { return key !== eventKey; });
+            }
+            else {
+                // 手风琴模式 仅展开
+                if (isVericalInline && accordion) {
+                    var keyPaths = this.getKeyPaths(navigations, eventKey);
+                    openKeys = __spreadArray(__spreadArray([], keyPaths, true), [eventKey], false);
+                }
+                else {
+                    openKeys.push(eventKey);
+                }
+            }
+            var currentItem = findTree(navigations, function (item) { return item.id === eventKey; });
+            // 因为Nav里只处理当前菜单项 因此新增一个onToggle事件
+            onToggle === null || onToggle === void 0 ? void 0 : onToggle(currentItem === null || currentItem === void 0 ? void 0 : currentItem.link, isOpen);
+            onToggleExpand === null || onToggleExpand === void 0 ? void 0 : onToggleExpand(uniq(openKeys));
+        }
+    };
+    Menu.prototype.renderExpandIcon = function (ctx) {
+        var _this = this;
+        var _a = this.props, cx = _a.classnames, expandIcon = _a.expandIcon;
+        return (React__default.createElement("span", { key: "expand-toggle", className: cx('Nav-Menu-submenu-arrow'), onClick: function (e) {
+                _this.handleToggleExpand(ctx);
+                e.preventDefault();
+            } }, !expandIcon || !React__default.isValidElement(expandIcon) ? (React__default.createElement(CaretIcon, null)) : typeof expandIcon === 'string' ? (React__default.createElement("i", { className: cx(expandIcon) })) : (expandIcon)));
+    };
+    Menu.prototype.renderMenuContent = function (list) {
+        var _this = this;
+        var _a = this.props, renderLink = _a.renderLink, cx = _a.classnames, themeColor = _a.themeColor, disabled = _a.disabled, badge = _a.badge, data = _a.data;
+        return list.map(function (item) {
+            var _a;
+            var itemDisabled = item.disabled === undefined ? disabled : item.disabled;
+            var link = item.link;
+            if ((link && link.defer && !link.loaded) ||
+                (item.children && item.children.length)) {
+                return (React__default.createElement(SubMenu, __assign({}, item, { key: item.id, disabled: itemDisabled || link.loading, badge: badge, renderLink: renderLink }), _this.renderMenuContent(item.children || [])));
+            }
+            return item.isDivider ? (React__default.createElement(Divider, { key: item.id, className: cx("Nav-Menu-item-divider", (_a = {},
+                    _a['Nav-Menu-item-divider-dark'] = themeColor === 'dark',
+                    _a)) })) : (React__default.createElement(MenuItem, __assign({}, item, { key: item.id, disabled: itemDisabled, renderLink: renderLink, badge: badge, data: data })));
+        });
+    };
+    Menu.prototype.render = function () {
+        var _a;
+        var _b;
+        var _c = this.props, classPrefix = _c.classPrefix, className = _c.className, cx = _c.classnames, collapsed = _c.collapsed, themeColor = _c.themeColor, stacked = _c.stacked, mode = _c.mode, accordion = _c.accordion, prefix = _c.prefix, disabled = _c.disabled, draggable = _c.draggable, triggerSubMenuAction = _c.triggerSubMenuAction, direction = _c.direction, overflowedIndicator = _c.overflowedIndicator, disabledOverflow = _c.disabledOverflow, overflowMaxCount = _c.overflowMaxCount, overflowComponent = _c.overflowComponent, overflowedIndicatorPopupClassName = _c.overflowedIndicatorPopupClassName, overflowSuffix = _c.overflowSuffix, overflowItemWidth = _c.overflowItemWidth, overflowStyle = _c.overflowStyle, popOverContainer = _c.popOverContainer, inlineIndent = _c.inlineIndent, expandBefore = _c.expandBefore, onDragStart = _c.onDragStart;
+        var _d = this.state, navigations = _d.navigations, activeKey = _d.activeKey, defaultOpenKeys = _d.defaultOpenKeys, openKeys = _d.openKeys;
+        var isDarkTheme = themeColor === 'dark';
+        var disabledItem = findTree(navigations, function (item) { return !!item.disabled; });
+        var rcMode = stacked
+            ? mode === 'float'
+                ? 'vertical-right'
+                : 'vertical'
+            : 'horizontal';
+        return (React__default.createElement(MenuContext.Provider, { value: {
+                themeColor: themeColor,
+                stacked: stacked,
+                mode: mode,
+                collapsed: collapsed,
+                direction: direction,
+                prefix: prefix,
+                inlineIndent: inlineIndent,
+                accordion: accordion,
+                draggable: draggable,
+                onDragStart: onDragStart,
+                onSubmenuClick: this.handleSubMenuTitleClick
+            } },
+            React__default.createElement(RcMenu, { key: "menu", prefixCls: "".concat(classPrefix, "Nav-Menu"), className: cx("Nav-Menu-".concat(direction), className, (_a = {},
+                    _a['Nav-Menu-collapsed'] = stacked && collapsed,
+                    _a['Nav-Menu-dark'] = isDarkTheme,
+                    _a['Nav-Menu-light'] = !isDarkTheme,
+                    _a['Nav-Menu-disabled'] = disabled || !!disabledItem,
+                    _a['Nav-Menu-expand-before'] = stacked && mode === 'inline' && !collapsed && expandBefore,
+                    _a)), direction: direction, 
+                // @ts-ignore
+                // horizontal inline vertical-right
+                mode: stacked && mode === 'inline' && !collapsed ? 'inline' : rcMode, inlineIndent: inlineIndent, triggerSubMenuAction: triggerSubMenuAction, expandIcon: this.renderExpandIcon, getPopupContainer: popOverContainer, overflowedIndicator: React__default.isValidElement(overflowedIndicator) ? (React__default.cloneElement(overflowedIndicator, {
+                    className: cx('Nav-Menu-item-icon Nav-Menu-overflowedIcon', (_b = overflowedIndicator.props) === null || _b === void 0 ? void 0 : _b.className)
+                })) : (React__default.createElement("i", { className: cx('Nav-Menu-item-icon Nav-Menu-overflowedIcon', 'fa fa-ellipsis-h') })), 
+                // RcMenu没有暴露这个属性 但实际可以覆盖
+                // @ts-ignore
+                maxCount: stacked || disabledOverflow
+                    ? ForwardOverflow.INVALIDATE
+                    : overflowMaxCount || ForwardOverflow.RESPONSIVE, component: overflowComponent || 'ul', style: overflowStyle, overflowedIndicatorPopupClassName: overflowedIndicatorPopupClassName, suffix: overflowSuffix ? overflowSuffix : null, itemWidth: overflowItemWidth ? overflowItemWidth : null, selectedKeys: activeKey != null ? activeKey : [], defaultOpenKeys: defaultOpenKeys, openKeys: collapsed || !stacked || (stacked && mode === 'float')
+                    ? undefined
+                    : openKeys, onClick: this.handleItemClick }, this.renderMenuContent(navigations))));
+    };
+    Menu.defaultProps = {
+        collapsed: false,
+        themeColor: 'light',
+        stacked: true,
+        mode: 'inline',
+        direction: 'ltr',
+        prefix: '',
+        triggerSubMenuAction: 'click',
+        inlineIndent: 15,
+        popOverContainer: function () { return document.body; },
+        renderLink: function (link) {
+            return { pathname: link.path };
+        },
+        isActive: function (link, prefix) {
+            var path = link.path;
+            var ret = location.pathname === path;
+            return !!ret;
+        },
+        isOpen: function (item) {
+            return item.children ? item.children.some(function (item) { return item.open; }) : false;
+        }
+    };
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", Promise)
+    ], Menu.prototype, "handleItemClick", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], Menu.prototype, "handleSubMenuTitleClick", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], Menu.prototype, "handleToggleExpand", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], Menu.prototype, "renderExpandIcon", null);
+    return Menu;
+}(React__default.Component));
+var index = themeable(Menu);
+
+export { Menu, index as default };

package/esm/components/schema-editor/Array.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';

package/esm/components/schema-editor/Common.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';

package/esm/components/schema-editor/Item.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __assign } from 'tslib';

package/esm/components/schema-editor/Object.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';

package/esm/components/schema-editor/SchemaVariableList.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __decorate, __metadata } from 'tslib';

package/esm/components/schema-editor/SchemaVariableListPicker.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends } from 'tslib';

package/esm/components/schema-editor/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';

package/esm/components/table/Cell.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __assign } from 'tslib';

package/esm/components/table/HeadCellDropDown.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __assign } from 'tslib';

package/esm/components/table/HeadCellFilter.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __assign, __awaiter, __generator, __spreadArray } from 'tslib';

package/esm/components/table/HeadCellSelect.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends } from 'tslib';

package/esm/components/table/HeadCellSort.d.ts

@@ -9,6 +9,7 @@ import { ColumnProps } from './index';
 export interface Props extends ThemeProps, LocaleProps {
     column: ColumnProps;
     onSort?: Function;
+    active?: boolean;
     classnames: ClassNamesFn;
 }
 export interface State {
@@ -17,6 +18,7 @@ export interface State {
 }
 export declare class HeadCellSort extends React.Component<Props, State> {
     constructor(props: Props);
+    componentDidUpdate(prevProps: Readonly<Props>): void;
     render(): JSX.Element;
 }
 declare const _default: {

package/esm/components/table/HeadCellSort.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __awaiter, __generator } from 'tslib';
@@ -22,33 +22,45 @@ var HeadCellSort = /** @class */ (function (_super) {
         };
         return _this;
     }
+    HeadCellSort.prototype.componentDidUpdate = function (prevProps) {
+        var props = this.props;
+        // 失效后重置，同时只能有一列在排序
+        if ((props === null || props === void 0 ? void 0 : props.active) !== undefined &&
+            !(props === null || props === void 0 ? void 0 : props.active) &&
+            props.active !== (prevProps === null || prevProps === void 0 ? void 0 : prevProps.active)) {
+            this.setState({ orderBy: '', order: '' });
+        }
+    };
     HeadCellSort.prototype.render = function () {
         var _this = this;
-        var _a = this.props, column = _a.column, onSort = _a.onSort, cx = _a.classnames;
+        var _a = this.props, active = _a.active, column = _a.column, onSort = _a.onSort, cx = _a.classnames;
         return (React__default.createElement("span", { className: cx('TableCell-sortBtn'), onClick: function () { return __awaiter(_this, void 0, void 0, function () {
                 var sortPayload, prevented;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            sortPayload = {};
+                            sortPayload = {
+                                orderBy: '',
+                                order: ''
+                            };
                             if (column.name === this.state.orderBy) {
-                                if (this.state.order === 'descend') {
+                                if (this.state.order === 'desc') {
                                     // 降序改为取消
-                                    sortPayload = { orderBy: '', order: 'ascend' };
+                                    sortPayload = { orderBy: '', order: '' };
                                 }
                                 else {
                                     // 升序之后降序
-                                    sortPayload = { order: 'descend' };
+                                    sortPayload = { orderBy: column.name, order: 'desc' };
                                 }
                             }
                             else {
                                 // 默认先升序
-                                sortPayload = { orderBy: column.name, order: 'ascend' };
+                                sortPayload = { orderBy: column.name, order: 'asc' };
                             }
                             if (!onSort) return [3 /*break*/, 2];
                             return [4 /*yield*/, onSort({
-                                    orderBy: this.state.orderBy,
-                                    order: this.state.order
+                                    orderBy: sortPayload.orderBy,
+                                    order: sortPayload.order
                                 })];
                         case 1:
                             prevented = _a.sent();
@@ -62,15 +74,11 @@ var HeadCellSort = /** @class */ (function (_super) {
                     }
                 });
             }); } },
-            React__default.createElement("i", { className: cx('TableCell-sortBtn--down', this.state.orderBy === column.name && this.state.order === 'descend'
-                    ? 'is-active'
-                    : '') },
+            React__default.createElement("i", { className: cx('TableCell-sortBtn--down', active && this.state.order === 'desc' ? 'is-active' : '') },
                 React__default.createElement(Icon, { icon: "sort-desc", className: "icon" })),
-            React__default.createElement("i", { className: cx('TableCell-sortBtn--up', this.state.orderBy === column.name && this.state.order === 'ascend'
-                    ? 'is-active'
-                    : '') },
+            React__default.createElement("i", { className: cx('TableCell-sortBtn--up', active && this.state.order === 'asc' ? 'is-active' : '') },
                 React__default.createElement(Icon, { icon: "sort-asc", className: "icon" })),
-            React__default.createElement("i", { className: cx('TableCell-sortBtn--default', this.state.orderBy === column.name ? '' : 'is-active') },
+            React__default.createElement("i", { className: cx('TableCell-sortBtn--default', active ? '' : 'is-active') },
                 React__default.createElement(Icon, { icon: "sort-default", className: "icon" }))));
     };
     return HeadCellSort;

package/esm/components/table/ItemActionsWrapper.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends } from 'tslib';

package/esm/components/table/index.d.ts

@@ -130,6 +130,7 @@ export interface TableState {
         record: any;
         target: HTMLTableRowElement;
     } | null;
+    sort?: SortProps;
 }
 export declare class Table extends React.PureComponent<TableProps, TableState> {
     static defaultProps: {

package/esm/components/table/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __spreadArray, __awaiter, __generator, __assign, __decorate, __metadata, __rest } from 'tslib';
@@ -645,12 +645,18 @@ var Table = /** @class */ (function (_super) {
                     : null)) : null,
                 isLeftExpandable && index === 0 ? expandableCell : null,
                 data.map(function (item, i) {
-                    var _a, _b;
+                    var _a, _b, _c;
                     var sort = null;
                     if (item.sorter) {
-                        sort = (React__default.createElement(HeadCellSort, { column: item, onSort: onSort
-                                ? onSort
-                                : function (payload) {
+                        sort = (React__default.createElement(HeadCellSort, { column: item, active: !!((_a = _this.state.sort) === null || _a === void 0 ? void 0 : _a.orderBy) &&
+                                _this.state.sort.orderBy === (item === null || item === void 0 ? void 0 : item.name), onSort: function (payload) {
+                                _this.setState({
+                                    sort: payload
+                                });
+                                if (onSort) {
+                                    onSort(payload);
+                                }
+                                else {
                                     if (typeof item.sorter === 'function') {
                                         if (payload.orderBy) {
                                             var sortList = __spreadArray([], _this.state.dataSource, true);
@@ -662,7 +668,8 @@ var Table = /** @class */ (function (_super) {
                                             _this.setState({ dataSource: __spreadArray([], dataSource, true) });
                                         }
                                     }
-                                } }));
+                                }
+                            } }));
                     }
                     var filter = null;
                     if (item.filterDropdown) {
@@ -674,14 +681,14 @@ var Table = /** @class */ (function (_super) {
                     // th的最后一行才可调整列宽
                     // 分组情况下 最后一行才和列配置个数对应
                     // 就可以根据index找到col 不依赖name
-                    var noChildren = !((_a = item.children) === null || _a === void 0 ? void 0 : _a.length);
+                    var noChildren = !((_b = item.children) === null || _b === void 0 ? void 0 : _b.length);
                     var cIndex = -1;
                     if (noChildren) {
                         // 根据name去tdColumns匹配出index
                         // 没设置name的 那一定不是要绑定数据的列 一般都是分组的上层 也不会出现调整列宽
                         cIndex = tdColumns.findIndex(function (c) { return c.name === item.name; });
                     }
-                    var children = !((_b = item.children) === null || _b === void 0 ? void 0 : _b.length) ? (React__default.createElement("span", null,
+                    var children = !((_c = item.children) === null || _c === void 0 ? void 0 : _c.length) ? (React__default.createElement("span", null,
                         sort,
                         filter,
                         resizable ? (React__default.createElement("i", { className: cx('Table-thead-resizable'), onMouseDown: function (e) { return _this.onResizeMouseDown(e, cIndex); } })) : null)) : null;

package/esm/components/virtual-list/AutoSizer.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __extends, __assign } from 'tslib';

package/esm/components/virtual-list/SizeAndPositionManager.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { ALIGNMENT } from './constants.js';

package/esm/components/virtual-list/constants.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 var _a, _b, _c, _d, _e;

package/esm/components/virtual-list/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __assign, __extends, __rest } from 'tslib';

package/esm/hooks/use-set-state.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v2.6.0
- * Copyright 2018-2022 fex
+ * amis-ui v2.7.0
+ * Copyright 2018-2023 fex
  */
 
 import { __assign } from 'tslib';