amis-ui 2.9.0 → 3.1.0

package/lib/components/formula/VariableList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -41,8 +41,8 @@ function VariableList(props) {
                 (option === null || option === void 0 ? void 0 : option.tag) ? (React__default["default"].createElement("span", { className: cx("".concat(classPrefix, "-item-tag")) }, option.tag)) : null));
         };
     function onSearch(term) {
-        var tree = amisCore.findTree(list, function (i) { return ~i.label.indexOf(term); });
-        setFilterVars(!term ? list : tree ? [tree] : []);
+        var tree = amisCore.findTreeAll(list, function (i) { return ~i.label.indexOf(term); });
+        setFilterVars(!term ? list : tree);
     }
     function renderSearchBox() {
         return (React__default["default"].createElement("div", { className: cx('FormulaEditor-VariableList-searchBox') },

package/lib/components/formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/icons.d.ts

@@ -28,21 +28,22 @@ import Role from '../icons/role.svg';
 import Department from '../icons/department.svg';
 import Post from '../icons/post.svg';
 import RightDoubleArrowIcon from '../icons/right-double-arrow.svg';
-export declare const closeIcon: JSX.Element;
-export declare const unDoIcon: JSX.Element;
-export declare const reDoIcon: JSX.Element;
-export declare const enterIcon: JSX.Element;
-export declare const volumeIcon: JSX.Element;
-export declare const muteIcon: JSX.Element;
-export declare const playIcon: JSX.Element;
-export declare const pauseIcon: JSX.Element;
-export declare const leftArrowIcon: JSX.Element;
-export declare const rightArrowIcon: JSX.Element;
+export declare const closeIcon: React.JSX.Element;
+export declare const unDoIcon: React.JSX.Element;
+export declare const reDoIcon: React.JSX.Element;
+export declare const enterIcon: React.JSX.Element;
+export declare const volumeIcon: React.JSX.Element;
+export declare const muteIcon: React.JSX.Element;
+export declare const playIcon: React.JSX.Element;
+export declare const pauseIcon: React.JSX.Element;
+export declare const leftArrowIcon: React.JSX.Element;
+export declare const rightArrowIcon: React.JSX.Element;
+export declare function getIconNames(): string[];
 export declare function getIcon(key: string): React.ElementType<{}>;
 export declare function hasIcon(iconName: string): boolean;
 export declare function registerIcon(key: string, component: React.ElementType<{}>): void;
 export declare function Icon({ icon, className, wrapClassName, classPrefix, iconContent, ...rest }: {
     icon: string;
     iconContent?: string;
-} & React.ComponentProps<any>): JSX.Element;
+} & React.ComponentProps<any>): React.JSX.Element;
 export { InputClearIcon, CloseIcon, UnDoIcon, ReDoIcon, EnterIcon, VolumeIcon, MuteIcon, PlayIcon, PauseIcon, ReloadIcon, LeftArrowIcon, RightArrowIcon, CheckIcon, PlusIcon, MinusIcon, PencilIcon, FunctionIcon, MenuIcon, UserRemove, Role, Department, Post, RightDoubleArrowIcon, DownArrowBoldIcon };

package/lib/components/icons.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -122,6 +122,9 @@ var pauseIcon = React__default["default"].createElement(pause["default"], null);
 var leftArrowIcon = React__default["default"].createElement(leftArrow["default"], null);
 var rightArrowIcon = React__default["default"].createElement(rightArrow["default"], null);
 var iconFactory = {};
+function getIconNames() {
+    return Object.keys(iconFactory);
+}
 function getIcon(key) {
     return iconFactory[key];
 }
@@ -262,9 +265,11 @@ function Icon(_a) {
     }
     var Component = getIcon(icon);
     var isURLIcon = typeof icon === 'string' && (icon === null || icon === void 0 ? void 0 : icon.indexOf('.')) !== -1;
+    var isIconfont = typeof icon === 'string' &&
+        (~(icon === null || icon === void 0 ? void 0 : icon.indexOf('iconfont')) || ~(icon === null || icon === void 0 ? void 0 : icon.indexOf('fa')));
     return Component ? (React__default["default"].createElement(React__default["default"].Fragment, null,
         iconContent ? (React__default["default"].createElement("div", { className: "".concat(wrapClassName || '') + ' ' + iconContent, ref: refFn })) : null,
-        !showCssIcon ? (React__default["default"].createElement(Component, tslib.__assign({}, rest, { className: "".concat(className || '', " icon-").concat(icon) }))) : null)) : isURLIcon ? (React__default["default"].createElement("img", { className: cx__default["default"]("".concat(classPrefix, "Icon"), className), src: icon })) : (React__default["default"].createElement("span", { className: "text-danger" },
+        !showCssIcon ? (React__default["default"].createElement(Component, tslib.__assign({}, rest, { className: "".concat(className || '', " icon-").concat(icon) }))) : null)) : isURLIcon ? (React__default["default"].createElement("img", { className: cx__default["default"]("".concat(classPrefix, "Icon"), className), src: icon })) : isIconfont ? (React__default["default"].createElement("i", { className: cx__default["default"](icon, className) })) : (React__default["default"].createElement("span", { className: "text-danger" },
         "\u6CA1\u6709 icon ",
         icon));
 }
@@ -297,6 +302,7 @@ exports.Icon = Icon;
 exports.closeIcon = closeIcon;
 exports.enterIcon = enterIcon;
 exports.getIcon = getIcon;
+exports.getIconNames = getIconNames;
 exports.hasIcon = hasIcon;
 exports.leftArrowIcon = leftArrowIcon;
 exports.muteIcon = muteIcon;

package/lib/components/index.d.ts

@@ -11,7 +11,6 @@ import Avatar from './Avatar';
 import Button from './Button';
 import Breadcrumb from './Breadcrumb';
 import Checkbox from './Checkbox';
-import Checkboxes from './Selection';
 import Collapse from './Collapse';
 import CollapseGroup from './CollapseGroup';
 import DatePicker from './DatePicker';
@@ -62,11 +61,13 @@ import SchemaVariableListPicker from './schema-editor/SchemaVariableListPicker';
 import SchemaVariableList from './schema-editor/SchemaVariableList';
 import VariableList from './formula/VariableList';
 import FormulaPicker from './formula/Picker';
+import { FormulaEditor } from './formula/Editor';
+import type { VariableItem } from './formula/Editor';
 import PickerContainer from './PickerContainer';
 import InputJSONSchema from './json-schema';
 import { Badge, withBadge } from './Badge';
 import type { BadgeObject } from './Badge';
-import { getIcon, Icon, registerIcon } from './icons';
+import { getIcon, getIconNames, Icon, registerIcon } from './icons';
 import { withRemoteConfig } from './WithRemoteConfig';
 import type { RemoteOptionsProps } from './WithRemoteConfig';
 import ConditionBuilder from './condition-builder';
@@ -111,4 +112,6 @@ import ConfirmBox from './ConfirmBox';
 import DndContainer from './DndContainer';
 import Menu from './menu';
 import InputBoxWithSuggestion from './InputBoxWithSuggestion';
-export { NotFound, Alert as AlertComponent, alert, Avatar, confirm, prompt, setRenderSchemaFn, ContextMenu, openContextMenus, Alert2, AsideNav, Button, Breadcrumb, Checkbox, Checkboxes, Collapse, CollapseGroup, DatePicker, DateRangePicker, Drawer, Tabs, Tab, Editor, Html, Icons, Layout, LazyComponent, Modal, Overlay, PopOver, Radios, Range, Rating, Select, SparkLine, Spinner, SpinnerExtraProps, Switch, Textarea, TitleBar, ToastComponent, toast, Tooltip, TooltipWrapper, Tree, Transfer, TabsTransfer, Selection, GroupedSelection, ChainedSelection, TableSelection, TreeSelection, AssociatedSelection, ResultBox, InputBox, InputBoxWithSuggestion, SearchBox, ListGroup, NumberInput, ArrayInput, PullRefresh, Table, SchemaVariableListPicker, SchemaVariableList, VariableList, PickerContainer, ConfirmBox, FormulaPicker, InputJSONSchema, withBadge, BadgeObject, Icon, withRemoteConfig, RemoteOptionsProps, ConditionBuilder, ConditionBuilderFuncs, ConditionBuilderFields, ConditionBuilderConfig, CityArea, PresetColor, ListMenu, Input, JSONSchemaEditor, LocationPicker, PopUp, Cascader, TransferDropDown, TabsTransferPicker, ResultList, TransferPicker, UserSelect, UserTabSelect, getIcon, registerIcon, Badge, HeadCellDropDown, AnchorNav, AnchorNavSection, Card, GridNavDirection, GridNav, GridNavItem, Link, VirtualList, AutoSizer, withStore, PopOverContainer, Pagination, Progress, Steps, StepStatus, Tag, Timeline, ImageGallery, BaiduMapPicker, MultilineText, Form, FormField, Controller, Combo, InputTable, InputTableColumnProps, DndContainer, Menu };
+import { CodeMirrorEditor } from './CodeMirror';
+import type CodeMirror from 'codemirror';
+export { NotFound, Alert as AlertComponent, alert, Avatar, confirm, prompt, setRenderSchemaFn, ContextMenu, openContextMenus, Alert2, AsideNav, Button, Breadcrumb, Checkbox, Selection as Checkboxes, Collapse, CollapseGroup, DatePicker, DateRangePicker, Drawer, Tabs, Tab, Editor, Html, Icons, Layout, LazyComponent, Modal, Overlay, PopOver, Radios, Range, Rating, Select, SparkLine, Spinner, SpinnerExtraProps, Switch, Textarea, TitleBar, ToastComponent, toast, Tooltip, TooltipWrapper, Tree, Transfer, TabsTransfer, Selection, GroupedSelection, ChainedSelection, TableSelection, TreeSelection, AssociatedSelection, ResultBox, InputBox, InputBoxWithSuggestion, SearchBox, ListGroup, NumberInput, ArrayInput, PullRefresh, Table, SchemaVariableListPicker, SchemaVariableList, VariableList, PickerContainer, ConfirmBox, FormulaPicker, VariableItem, FormulaEditor, InputJSONSchema, withBadge, BadgeObject, Icon, withRemoteConfig, RemoteOptionsProps, ConditionBuilder, ConditionBuilderFuncs, ConditionBuilderFields, ConditionBuilderConfig, CityArea, PresetColor, ListMenu, Input, JSONSchemaEditor, LocationPicker, PopUp, Cascader, TransferDropDown, TabsTransferPicker, ResultList, TransferPicker, UserSelect, UserTabSelect, getIcon, getIconNames, registerIcon, Badge, HeadCellDropDown, AnchorNav, AnchorNavSection, Card, GridNavDirection, GridNav, GridNavItem, Link, VirtualList, AutoSizer, withStore, PopOverContainer, Pagination, Progress, Steps, StepStatus, Tag, Timeline, ImageGallery, BaiduMapPicker, MultilineText, Form, FormField, Controller, Combo, InputTable, InputTableColumnProps, DndContainer, Menu, CodeMirror, CodeMirrorEditor };

package/lib/components/json-schema/Array.d.ts

@@ -1,2 +1,3 @@
+import React from 'react';
 import type { InputJSONSchemaItemProps } from './index';
-export declare function InputJSONSchemaArray(props: InputJSONSchemaItemProps): JSX.Element;
+export declare function InputJSONSchemaArray(props: InputJSONSchemaItemProps): React.JSX.Element;

package/lib/components/json-schema/Array.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/json-schema/Item.d.ts

@@ -1,2 +1,3 @@
+import React from 'react';
 import type { InputJSONSchemaItemProps } from './index';
-export declare function InputJSONSchemaItem(props: InputJSONSchemaItemProps): JSX.Element;
+export declare function InputJSONSchemaItem(props: InputJSONSchemaItemProps): React.JSX.Element;

package/lib/components/json-schema/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/json-schema/Object.d.ts

@@ -1,2 +1,3 @@
+import React from 'react';
 import type { InputJSONSchemaItemProps } from './index';
-export declare function InputJSONSchemaObject(props: InputJSONSchemaItemProps): JSX.Element;
+export declare function InputJSONSchemaObject(props: InputJSONSchemaItemProps): React.JSX.Element;

package/lib/components/json-schema/Object.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/json-schema/index.d.ts

@@ -16,7 +16,7 @@ export interface InputJSONSchemaItemProps extends ThemeProps, LocaleProps {
 export interface InputJSONSchemaProps extends Omit<InputJSONSchemaItemProps, 'schema'> {
     schema?: any;
 }
-declare function InputJSONSchema(props: InputJSONSchemaProps): JSX.Element;
+declare function InputJSONSchema(props: InputJSONSchemaProps): React.JSX.Element;
 declare const _default: {
     new (props: Omit<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
         locale?: string | undefined;
@@ -25,7 +25,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
             locale?: string | undefined;
@@ -84,7 +84,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
                 locale?: string | undefined;
@@ -147,7 +147,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
             locale?: string | undefined;
@@ -210,7 +210,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
                 locale?: string | undefined;

package/lib/components/json-schema/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/menu/MenuContext.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/menu/MenuItem.d.ts

@@ -38,20 +38,17 @@ export declare class MenuItem extends React.Component<MenuItemProps> {
      * @memberof MenuItem
      */
     internalProps: string[];
-    getDynamicStyle(hasIcon: boolean): {
-        maxWidth: string;
-    };
     /** 检查icon参数值是否为文件路径 */
     isImgPath(raw: string): boolean;
-    renderMenuItem(): JSX.Element;
-    render(): JSX.Element | null;
+    renderMenuItem(): React.JSX.Element;
+    render(): React.JSX.Element | null;
 }
 declare const _default: {
     new (props: Omit<MenuItemProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<MenuItemProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;

package/lib/components/menu/MenuItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -50,24 +50,6 @@ var MenuItem = /** @class */ (function (_super) {
         ];
         return _this;
     }
-    MenuItem.prototype.getDynamicStyle = function (hasIcon) {
-        var _a = this.context, stacked = _a.stacked, _b = _a.inlineIndent, inlineIndent = _b === void 0 ? 16 : _b;
-        var depth = this.props.depth;
-        var isHorizontal = !stacked;
-        var defaultIndentWidth = typeof inlineIndent === 'number' ? inlineIndent : 16;
-        var indentWidth = "(\n      ".concat(hasIcon ? 'var(--Menu-icon-size) + var(--gap-sm) +' : '', "\n      ").concat(depth === 1
-            ? isHorizontal
-                ? 'var(--Menu-Submenu-title-paddingX) * 2'
-                : '0px'
-            : isHorizontal
-                ? "var(--Menu-Submenu-title-paddingX) + ".concat(defaultIndentWidth, "px")
-                : "".concat(defaultIndentWidth, "px"), "\n    )");
-        return {
-            maxWidth: isHorizontal
-                ? "calc(var(--Menu-width) - ".concat(indentWidth, ")")
-                : "calc(100% - ".concat(indentWidth, ")")
-        };
-    };
     /** 检查icon参数值是否为文件路径 */
     MenuItem.prototype.isImgPath = function (raw) {
         return (typeof raw === 'string' &&
@@ -89,12 +71,11 @@ var MenuItem = /** @class */ (function (_super) {
         })) : null) : null;
         var labelNode = label && (typeof label === 'string' || Array.isArray(label)) ? (React__default["default"].createElement("span", { className: cx("Nav-Menu-item-label", (_c = {},
                 _c['Nav-Menu-item-label-collapsed'] = isCollapsedNode,
-                _c)), title: isCollapsedNode || Array.isArray(label) ? '' : label, style: this.getDynamicStyle(!!iconNode) }, isCollapsedNode ? label.slice(0, 1) : label)) : React__default["default"].isValidElement(label) ? (React__default["default"].cloneElement(label, {
+                _c)), title: isCollapsedNode || Array.isArray(label) ? '' : label }, isCollapsedNode ? label.slice(0, 1) : label)) : React__default["default"].isValidElement(label) ? (React__default["default"].cloneElement(label, {
             className: cx('Nav-Menu-item-label', (_f = label === null || label === void 0 ? void 0 : label.props) === null || _f === void 0 ? void 0 : _f.className, (_d = {},
                 _d['Nav-Menu-item-label-collapsed'] = isCollapsedNode,
                 _d['Nav-Menu-item-label-subTitle'] = !isCollapsedNode,
-                _d)),
-            style: this.getDynamicStyle(!!iconNode)
+                _d))
         })) : null;
         var dragNode = !disabled && stacked && mode === 'inline' && !collapsed && draggable ? (React__default["default"].createElement("span", { className: cx('Nav-Menu-item-dragBar'), draggable: true },
             React__default["default"].createElement(DragIcon, null))) : null;
@@ -113,7 +94,7 @@ var MenuItem = /** @class */ (function (_super) {
     };
     MenuItem.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, tooltipClassName = _b.tooltipClassName, cx = _b.classnames, label = _b.label, disabled = _b.disabled, disabledTip = _b.disabledTip, tooltipContainer = _b.tooltipContainer, tooltipTrigger = _b.tooltipTrigger, depth = _b.depth, hidden = _b.hidden, order = _b.order, overflowedIndicator = _b.overflowedIndicator, overflowMaxCount = _b.overflowMaxCount;
+        var _b = this.props, tooltipClassName = _b.tooltipClassName, cx = _b.classnames, label = _b.label, disabled = _b.disabled, disabledTip = _b.disabledTip, tooltipContainer = _b.tooltipContainer, tooltipTrigger = _b.tooltipTrigger, depth = _b.depth, hidden = _b.hidden, order = _b.order, overflowedIndicator = _b.overflowedIndicator, overflowMaxCount = _b.overflowMaxCount;
         var _c = this.context, collapsed = _c.collapsed, mode = _c.mode, stacked = _c.stacked, themeColor = _c.themeColor, direction = _c.direction;
         var showToolTip = stacked && mode === 'inline' && collapsed && depth === 1;
         var isMaxOverflow = overflowedIndicator && overflowMaxCount;
@@ -125,7 +106,7 @@ var MenuItem = /** @class */ (function (_super) {
                 _a['Nav-Menu-item-tooltip-dark'] = themeColor === 'dark',
                 _a)), placement: direction === 'rtl' ? 'left' : 'right', tooltip: disabled ? disabledTip : showToolTip ? label : '', container: tooltipContainer, trigger: tooltipTrigger, rootClose: true },
             React__default["default"].createElement("ul", { className: cx('Nav-Menu-item-tooltip-wrap'), style: isMaxOverflow ? {} : { order: order } },
-                React__default["default"].createElement(RcMenu.Item, tslib.__assign({}, pick__default["default"](this.props, this.internalProps), { className: cx(className) }), this.renderMenuItem()))));
+                React__default["default"].createElement(RcMenu.Item, tslib.__assign({}, pick__default["default"](this.props, this.internalProps)), this.renderMenuItem()))));
     };
     MenuItem.defaultProps = {
         disabled: false,

package/lib/components/menu/SubMenu.d.ts

@@ -42,20 +42,17 @@ export declare class SubMenu extends React.Component<SubMenuProps> {
      */
     internalProps: string[];
     handleSubmenuTitleActived({ key, domEvent }: MenuItemTitleInfo): void;
-    getDynamicStyle(hasIcon: boolean): {
-        maxWidth: string;
-    };
     /** 检查icon参数值是否为文件路径 */
     isImgPath(raw: string): boolean;
-    renderSubMenuTitle(): JSX.Element;
-    render(): JSX.Element | null;
+    renderSubMenuTitle(): React.JSX.Element;
+    render(): React.JSX.Element | null;
 }
 declare const _default: {
     new (props: Omit<SubMenuProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<SubMenuProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;

package/lib/components/menu/SubMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -63,21 +63,6 @@ var SubMenu = /** @class */ (function (_super) {
         var _b = this.context, onSubmenuClick = _b.onSubmenuClick, stacked = _b.stacked;
         stacked && (onSubmenuClick === null || onSubmenuClick === void 0 ? void 0 : onSubmenuClick({ key: key, domEvent: domEvent, props: this.props }));
     };
-    SubMenu.prototype.getDynamicStyle = function (hasIcon) {
-        var stacked = this.context.stacked;
-        var depth = this.props.depth;
-        var isHorizontal = !stacked;
-        var indentWidth = "(\n      ".concat(hasIcon ? 'var(--Menu-icon-size) + var(--gap-sm) +' : '', "\n      ").concat(isHorizontal
-            ? 'var(--Menu-Submenu-title-paddingX) * 2'
-            : depth === 1
-                ? '0px'
-                : 'var(--Menu-Submenu-title-paddingX)', "\n    )");
-        return {
-            maxWidth: isHorizontal
-                ? "calc(var(--Menu-width) - ".concat(indentWidth, ")")
-                : "calc(100% - ".concat(indentWidth, ")")
-        };
-    };
     /** 检查icon参数值是否为文件路径 */
     SubMenu.prototype.isImgPath = function (raw) {
         return (typeof raw === 'string' &&
@@ -87,28 +72,27 @@ var SubMenu = /** @class */ (function (_super) {
         var _a, _b, _c, _d;
         var _e, _f;
         var _g = this.context, collapsed = _g.collapsed, stacked = _g.stacked, mode = _g.mode, draggable = _g.draggable, onDragStart = _g.onDragStart;
-        var _h = this.props, cx = _h.classnames, id = _h.id, label = _h.label, icon = _h.icon, path = _h.path, depth = _h.depth, badge = _h.badge, badgeClassName = _h.badgeClassName, disabled = _h.disabled, defaultData = _h.data, extra = _h.extra, renderLink = _h.renderLink;
+        var _h = this.props, cx = _h.classnames, id = _h.id, label = _h.label, labelExtra = _h.labelExtra, icon = _h.icon, path = _h.path, depth = _h.depth, badge = _h.badge, badgeClassName = _h.badgeClassName, disabled = _h.disabled, defaultData = _h.data, extra = _h.extra, renderLink = _h.renderLink;
         var isCollapsedNode = collapsed && depth === 1;
         var link = renderLink && typeof renderLink === 'function'
             ? renderLink(this.props)
             : path || '';
-        var iconNode = icon ? (typeof icon === 'string' ? (this.isImgPath(icon) ? (React__default["default"].createElement("div", { className: cx("Menu-item-icon") },
-            React__default["default"].createElement("img", { width: "14px", src: icon }))) : (React__default["default"].createElement("i", { key: "icon", className: cx("Menu-item-icon", icon, (_a = {},
-                _a['Menu-item-icon-collapsed'] = isCollapsedNode,
+        var iconNode = icon ? (typeof icon === 'string' ? (this.isImgPath(icon) ? (React__default["default"].createElement("div", { className: cx("Nav-Menu-item-icon") },
+            React__default["default"].createElement("img", { width: "14px", src: icon }))) : (React__default["default"].createElement("i", { key: "icon", className: cx("Nav-Menu-item-icon", icon, (_a = {},
+                _a['Nav-Menu-item-icon-collapsed'] = isCollapsedNode,
                 _a)) }))) : React__default["default"].isValidElement(icon) ? (React__default["default"].cloneElement(icon, {
-            className: cx("Menu-item-icon", (_e = icon.props) === null || _e === void 0 ? void 0 : _e.className, (_b = {},
-                _b['Menu-item-icon-svg-collapsed'] = isCollapsedNode,
+            className: cx("Nav-Menu-item-icon", (_e = icon.props) === null || _e === void 0 ? void 0 : _e.className, (_b = {},
+                _b['Nav-Menu-item-icon-svg-collapsed'] = isCollapsedNode,
                 _b))
         })) : null) : null;
         var labelNode = label && (typeof label === 'string' || Array.isArray(label)) ? (React__default["default"].createElement("span", { className: cx('Nav-Menu-item-label', (_c = {},
                 _c['Nav-Menu-item-label-collapsed'] = isCollapsedNode,
                 _c['Nav-Menu-item-label-subTitle'] = !isCollapsedNode,
-                _c)), title: isCollapsedNode || Array.isArray(label) ? '' : label, style: this.getDynamicStyle(!!iconNode) }, isCollapsedNode ? label.slice(0, 1) : label)) : React__default["default"].isValidElement(label) ? (React__default["default"].cloneElement(label, {
+                _c)), title: isCollapsedNode || Array.isArray(label) ? '' : label }, isCollapsedNode ? label.slice(0, 1) : label)) : React__default["default"].isValidElement(label) ? (React__default["default"].cloneElement(label, {
             className: cx('Nav-Menu-item-label', (_f = label === null || label === void 0 ? void 0 : label.props) === null || _f === void 0 ? void 0 : _f.className, (_d = {},
                 _d['Nav-Menu-item-label-collapsed'] = isCollapsedNode,
                 _d['Nav-Menu-item-label-subTitle'] = !isCollapsedNode,
-                _d)),
-            style: this.getDynamicStyle(!!iconNode)
+                _d))
         })) : null;
         var dragNode = !disabled && stacked && mode === 'inline' && !collapsed && draggable ? (React__default["default"].createElement("span", { className: cx('Nav-Menu-item-dragBar'), draggable: true },
             React__default["default"].createElement(DragIcon, null))) : null;
@@ -117,7 +101,8 @@ var SubMenu = /** @class */ (function (_super) {
                 dragNode,
                 iconNode,
                 labelNode,
-                !stacked ? (React__default["default"].createElement("span", { key: "expand-toggle", className: cx('Nav-Menu-submenu-arrow') },
+                labelExtra,
+                !stacked && depth === 1 ? (React__default["default"].createElement("span", { key: "expand-toggle", className: cx('Nav-Menu-submenu-arrow') },
                     React__default["default"].createElement(icons.Icon, { icon: "right-arrow-bold", className: "icon" }))) : null));
         };
         return (React__default["default"].createElement("div", { className: cx('Nav-Menu-item-wrap') },
@@ -128,11 +113,11 @@ var SubMenu = /** @class */ (function (_super) {
     };
     SubMenu.prototype.render = function () {
         var _a, _b;
-        var _c = this.props, className = _c.className, popupClassName = _c.popupClassName, cx = _c.classnames, hidden = _c.hidden;
+        var _c = this.props, popupClassName = _c.popupClassName, cx = _c.classnames, hidden = _c.hidden;
         var isDarkTheme = this.context.themeColor === 'dark';
         return hidden ? null : (React__default["default"].createElement(RcMenu.SubMenu, tslib.__assign({}, pick__default["default"](this.props, this.internalProps), { className: cx('Nav-Menu-submenu', (_a = {},
                 _a['Nav-Menu-submenu-dark'] = isDarkTheme,
-                _a), className), popupClassName: cx('Nav-Menu-submenu-popup', (_b = {},
+                _a)), popupClassName: cx('Nav-Menu-submenu-popup', (_b = {},
                 _b['Nav-Menu-submenu-popup-dark'] = isDarkTheme,
                 _b), popupClassName), title: this.renderSubMenuTitle(), onTitleClick: this.handleSubmenuTitleActived })));
     };