amis-ui 2.8.0 → 3.0.0

package/lib/components/formula/VariableList.d.ts

@@ -25,12 +25,10 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<VariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<VariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<VariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/lib/components/formula/VariableList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.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] : list);
+        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.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/icons.d.ts

@@ -38,9 +38,9 @@ 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 function getIcon(key: string): React.ReactType<{}>;
+export declare function getIcon(key: string): React.ElementType<{}>;
 export declare function hasIcon(iconName: string): boolean;
-export declare function registerIcon(key: string, component: React.ReactType<{}>): void;
+export declare function registerIcon(key: string, component: React.ElementType<{}>): void;
 export declare function Icon({ icon, className, wrapClassName, classPrefix, iconContent, ...rest }: {
     icon: string;
     iconContent?: string;

package/lib/components/icons.js

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

package/lib/components/index.d.ts

@@ -62,6 +62,8 @@ 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';
@@ -110,4 +112,7 @@ import type { InputTableColumnProps } from './InputTable';
 import ConfirmBox from './ConfirmBox';
 import DndContainer from './DndContainer';
 import Menu from './menu';
-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, 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 InputBoxWithSuggestion from './InputBoxWithSuggestion';
+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, 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, 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,3 +1,2 @@
-/// <reference types="react" />
 import type { InputJSONSchemaItemProps } from './index';
 export declare function InputJSONSchemaArray(props: InputJSONSchemaItemProps): JSX.Element;

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

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

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

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

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

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

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

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

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

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

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

@@ -26,7 +26,7 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -35,9 +35,7 @@ declare const _default: {
         readonly props: Readonly<Omit<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -87,7 +85,7 @@ declare const _default: {
             childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): JSX.Element;
-            context: any;
+            context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -96,8 +94,6 @@ declare const _default: {
             readonly props: Readonly<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
-            }> & Readonly<{
-                children?: React.ReactNode;
             }>;
             state: Readonly<{}>;
             refs: {
@@ -152,7 +148,7 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -161,8 +157,6 @@ declare const _default: {
         readonly props: Readonly<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }> & Readonly<{
-            children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
         refs: {
@@ -217,7 +211,7 @@ declare const _default: {
             childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): JSX.Element;
-            context: any;
+            context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -226,8 +220,6 @@ declare const _default: {
             readonly props: Readonly<Omit<InputJSONSchemaProps, keyof LocaleProps> & {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
-            }> & Readonly<{
-                children?: React.ReactNode;
             }>;
             state: Readonly<{}>;
             refs: {

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

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

package/lib/components/menu/MenuContext.js

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

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

@@ -17,7 +17,7 @@ export interface MenuItemProps extends Omit<NavigationItem, 'children'>, RcMenuI
     classPrefix: string;
     classnames: ClassNamesFn;
     tooltipClassName?: string;
-    tooltipContainer?: React.ReactNode;
+    tooltipContainer?: HTMLElement | (() => HTMLElement);
     tooltipTrigger?: Trigger | Array<Trigger>;
     renderLink: Function;
     extra?: React.ReactNode;
@@ -38,9 +38,6 @@ 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;
@@ -52,12 +49,10 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        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;
-        readonly props: Readonly<Omit<MenuItemProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<MenuItemProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/lib/components/menu/MenuItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.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;
@@ -102,7 +83,8 @@ var MenuItem = /** @class */ (function (_super) {
             ? renderLink(this.props)
             : path || '';
         return (React__default["default"].createElement("div", { className: cx('Nav-Menu-item-wrap') },
-            React__default["default"].createElement(Badge.Badge, { classnames: cx, badge: badge ? tslib.__assign(tslib.__assign({}, badge), { className: badgeClassName }) : null, data: amisCore.createObject(defaultData, link) },
+            React__default["default"].createElement(Badge.Badge, { classnames: cx, badge: badge && !isCollapsedNode // 收起模式下 不展示角标
+                    ? tslib.__assign(tslib.__assign({}, badge), { className: badgeClassName }) : null, data: amisCore.createObject(defaultData, link) },
                 React__default["default"].createElement("a", { className: cx('Nav-Menu-item-link'), title: typeof (link === null || link === void 0 ? void 0 : link.label) === 'string' ? link === null || link === void 0 ? void 0 : link.label : undefined, "data-id": (link === null || link === void 0 ? void 0 : link.__id) || id, "data-depth": depth, onDragStart: onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(link) }, isCollapsedNode ? (React__default["default"].createElement(React__default["default"].Fragment, null, iconNode || labelNode)) : (React__default["default"].createElement(React__default["default"].Fragment, null,
                     dragNode,
                     iconNode,
@@ -112,15 +94,19 @@ 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;
+        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;
         // 多套一层ul 是因为disabled情况下 RcItem触发不了tooltipwrapper的事件
+        // 横向模式使用rc-overflow rc-overflow中会给li设置一个order属性
+        // 这里的ul可能和rc-overflow里的li并列 就导致展示顺序不正确 因此给url也设置一个order属性
+        // 当启用响应式收纳且设置了maxVisibleCount rc-overflow不会设置order属性 因此这种情况下ul也不需要设置
         return hidden ? null : (React__default["default"].createElement(TooltipWrapper["default"], { tooltipClassName: cx('Nav-Menu-item-tooltip', tooltipClassName, (_a = {},
                 _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') },
-                React__default["default"].createElement(RcMenu.Item, tslib.__assign({}, pick__default["default"](this.props, this.internalProps), { className: cx(className) }), this.renderMenuItem()))));
+            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)), this.renderMenuItem()))));
     };
     MenuItem.defaultProps = {
         disabled: false,

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

@@ -42,9 +42,6 @@ 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;
@@ -56,12 +53,10 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        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;
-        readonly props: Readonly<Omit<SubMenuProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<SubMenuProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/lib/components/menu/SubMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.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,21 +101,23 @@ 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') },
-            React__default["default"].createElement(Badge.Badge, { classnames: cx, badge: badge ? tslib.__assign(tslib.__assign({}, badge), { className: badgeClassName }) : null, data: amisCore.createObject(defaultData, link) },
+            React__default["default"].createElement(Badge.Badge, { classnames: cx, badge: badge && !isCollapsedNode // 收起模式下 不展示角标
+                    ? tslib.__assign(tslib.__assign({}, badge), { className: badgeClassName }) : null, data: amisCore.createObject(defaultData, link) },
                 React__default["default"].createElement("a", { className: cx("Nav-Menu-item-link"), "data-id": (link === null || link === void 0 ? void 0 : link.__id) || id, "data-depth": depth, onDragStart: onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(link) }, renderContent())),
             extra ? (React__default["default"].createElement("div", { className: cx('Nav-Menu-item-extra') }, extra)) : null));
     };
     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 })));
     };