x-next 1.4.0 → 1.5.0

package/AI_USAGE.md

@@ -1,9 +1,9 @@
 <!-- Generated by pnpm generate:ai-usage. Edit src/docs/guide/ai-usage-recipes.md and script/ai-usage/manifest.js. -->
 # x-next AI 使用手册
 
-适用版本：**x-next@1.4.0**。Vue：`^3.5.0`；Node：`>=20.19.0`。
+适用版本：**x-next@1.5.0**。Vue：`^3.5.0`；Node：`>=20.19.0`。
 
-来源指纹（精选示例、映射、版本与公开类型声明）：`37f7ca897f3f8851dd34e16a59bbdeb40404262841c8c0bc9112fc62100f031a`。
+来源指纹（精选示例、映射、版本与公开类型声明）：`8ed10e46d0e5b1359b27d93837370dcf2fca95d511be5e798e112ff5977d856f`。
 
 先按业务需要选择组件，不要求全部迁移。本手册限定在用户确认的 22 个组件及必要的同族子组件，未覆盖的导出不表示已完成业务验收。
 

package/CHANGELOG.md

@@ -2,6 +2,41 @@
 
 本项目遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
 
+## [1.5.0] - 2026-10-02
+
+### 修复
+
+- **Steps**：
+  - 修复横向连接线特异性回归——显示规则特异性 (0,4,1) 压过 arrow / navigation / vertical / dot / line-less 各模式的 `display: none` (0,2,1)，导致这些模式渲染出 5000px 的水平残线并溢出整页；改为给显示规则加模式守卫。
+  - 修复 SSR / 首帧所有步骤被判成 `finish`（DOM 测量未就绪时 `innerIndex` 为 -1、`stepNumber` 为 0），文档站静态产物此前是「全部打勾」；改用 setup 顺序号兜底。
+- **Menu**：
+  - 修复水平溢出收纳时，其内部弹层 Menu 向根收集器上报空数据，导致 `autoOpen` / `defaultOpenKeys` / `autoOpenSelected` 在溢出场景整体失效。
+  - 修复点击溢出收纳头会把内部占位 key `__arco-menu-overflow-sub-menu` 泄漏到 `update:openKeys` / `sub-menu-click` 公开事件。
+- **Tabs**：
+  - 补齐全垂直布局规则：标签间距、垂直专用水平内边距、内容区方向性留白、滚动轨道留白、新增按钮对齐。
+  - 修复 `justify` 与垂直布局同时命中导致导航与内容上下堆叠。
+  - 修复 `position="bottom"` 时激活下划线画在页面最底边、与分隔线错开一个标签高。
+  - tab 与 panel 补齐 `id` / `aria-controls` / `aria-labelledby` 双向关联，读屏可建立对应关系。
+  - `scrollPosition` 类型支持 `number`（原先只声明 `String`，传数字会触发 prop 校验告警）。
+- **Pagination**：
+  - 修复 `mm()` 误传含 `&` 的选择器导致编译出非法 CSS，首 / 末页箭头禁用色失效、看起来仍可点击。
+  - 修复 `autoAdjust` 判断分支不可达（`computedCurrent` 已钳制，条件恒假），总页数减少时不再调整当前页也不派发事件。
+  - 修复省略号死规则，`--x-pagination-size-icon-ellipsis` 字号首次生效。
+- **Dropdown**：
+  - 修复仅在 `optionProps` 中禁用子菜单时，hover 触发仍会弹出被禁用的子菜单。
+  - 根触发器补齐 `aria-haspopup` / `aria-expanded` 菜单语义。
+  - `DropdownButton` 的图标触发器补齐可访问名称（原为无名按钮）。
+- 修复 3 处 Less → SCSS 迁移残留的非法 CSS 值（`-var(...)` 与缺少 `calc` 的减法），这些声明此前被浏览器静默丢弃：Dropdown 子菜单浮层偏移、Menu 横向 pop 的 hover 桥接区、Menu popup 首分组间距校正。
+
+### 新增
+
+- 新增 `common.more` locale 文案（中文「更多操作」/ 英文「More actions」），供图标触发器提供可访问名称。
+- 新增 `pnpm run check:compiled-css`：检查编译产物的非法 CSS 值、BEM 拼接损坏的选择器，以及显式登记的层叠守卫，覆盖「SCSS 能编译、单测通过、浏览器静默丢弃规则」这一类此前无门禁的缺陷；已接入 `check` 总入口。
+
+### 测试
+
+- 新增 5 项回归测试：Menu 溢出收纳不泄漏内部 key、Pagination `autoAdjust` 越界派发与未越界不派发、Tabs tab/panel id 双向关联与唯一性、Steps SSR 首帧状态推算。
+
 ## [1.4.0] - 2026-10-02
 
 ### 新增

package/dist/components/dropdown/DropdownButton.vue.d.ts

@@ -92,6 +92,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         modifier: (className: string) => string;
         is: (className: string) => string;
     };
+    t: (key: import('../../locale').LocaleKey | (string & {}), params?: Record<string, string | number>) => string;
     computedPopupVisible: import('vue').ComputedRef<boolean>;
     handleClick: (ev: MouseEvent) => void;
     handleSelect: (value: string | number | Record<string, unknown> | undefined, ev: Event) => void;
@@ -1356,7 +1357,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
             panelElement: import('vue').Ref<HTMLElement | undefined, HTMLElement | undefined>;
             handleKeydown: (ev: KeyboardEvent) => void;
             handleScroll: (e: Event) => void;
-            t: (key: import('../../index.ts').LocaleKey | (string & {}), params?: Record<string, string | number>) => string;
+            t: (key: import('../../locale').LocaleKey | (string & {}), params?: Record<string, string | number>) => string;
         }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, ("close" | "scroll" | "reachBottom")[], "close" | "scroll" | "reachBottom", import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
             closeOnArrowLeft: BooleanConstructor;
             loading: {

package/dist/components/dropdown/index.d.ts

@@ -5713,6 +5713,7 @@ export declare const DropdownButton: {
             modifier: (className: string) => string;
             is: (className: string) => string;
         };
+        t: (key: import('../..').LocaleKey | (string & {}), params?: Record<string, string | number>) => string;
         computedPopupVisible: import('vue').ComputedRef<boolean>;
         handleClick: (ev: MouseEvent) => void;
         handleSelect: (value: string | number | Record<string, unknown> | undefined, ev: Event) => void;
@@ -7430,6 +7431,7 @@ export declare const DropdownButton: {
             modifier: (className: string) => string;
             is: (className: string) => string;
         };
+        t: (key: import('../..').LocaleKey | (string & {}), params?: Record<string, string | number>) => string;
         computedPopupVisible: import('vue').ComputedRef<boolean>;
         handleClick: (ev: MouseEvent) => void;
         handleSelect: (value: string | number | Record<string, unknown> | undefined, ev: Event) => void;
@@ -7498,6 +7500,7 @@ export declare const DropdownButton: {
         modifier: (className: string) => string;
         is: (className: string) => string;
     };
+    t: (key: import('../..').LocaleKey | (string & {}), params?: Record<string, string | number>) => string;
     computedPopupVisible: import('vue').ComputedRef<boolean>;
     handleClick: (ev: MouseEvent) => void;
     handleSelect: (value: string | number | Record<string, unknown> | undefined, ev: Event) => void;

package/dist/components/steps/context.d.ts

@@ -14,5 +14,14 @@ export interface StepsContext {
     getStatus: (step: number) => StepStatus;
     onClick: (step: number, ev: Event) => void;
     parentCls: string;
+    /**
+     * 按 setup 顺序取序号（1 起）。
+     *
+     * DOM 测量（useIndex）在 SSR / 首帧不可用，此时 innerIndex 为 -1，
+     * stepNumber 变成 0，getStatus(0) 会把所有步骤判成 finish——文档站是
+     * SSR，会直接产出「全部打勾」的静态 HTML。setup 顺序即渲染顺序，
+     * 用它兜底可让首帧状态正确；挂载后仍以 DOM 实测值为准。
+     */
+    registerOrder: () => number;
 }
 export declare const stepsInjectionKey: InjectionKey<StepsContext>;

package/dist/components/tabs/TabPane.vue.d.ts

@@ -39,6 +39,8 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     active: import('vue').ComputedRef<boolean>;
     itemRef: import('vue').Ref<HTMLElement | undefined, HTMLElement | undefined>;
     mounted: import('vue').Ref<boolean, boolean>;
+    tabId: import('vue').ComputedRef<string>;
+    panelId: import('vue').ComputedRef<string>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /**
      * @zh 选项卡的标题

package/dist/components/tabs/index.d.ts

@@ -323,6 +323,8 @@ export declare const TabPane: {
         active: import('vue').ComputedRef<boolean>;
         itemRef: import('vue').Ref<HTMLElement | undefined, HTMLElement | undefined>;
         mounted: import('vue').Ref<boolean, boolean>;
+        tabId: import('vue').ComputedRef<string>;
+        panelId: import('vue').ComputedRef<string>;
     }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {
         disabled: boolean;
         closable: boolean;
@@ -358,6 +360,8 @@ export declare const TabPane: {
         active: import('vue').ComputedRef<boolean>;
         itemRef: import('vue').Ref<HTMLElement | undefined, HTMLElement | undefined>;
         mounted: import('vue').Ref<boolean, boolean>;
+        tabId: import('vue').ComputedRef<string>;
+        panelId: import('vue').ComputedRef<string>;
     }, {}, {}, {}, {
         disabled: boolean;
         closable: boolean;
@@ -390,6 +394,8 @@ export declare const TabPane: {
     active: import('vue').ComputedRef<boolean>;
     itemRef: import('vue').Ref<HTMLElement | undefined, HTMLElement | undefined>;
     mounted: import('vue').Ref<boolean, boolean>;
+    tabId: import('vue').ComputedRef<string>;
+    panelId: import('vue').ComputedRef<string>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, {
     disabled: boolean;
     closable: boolean;

package/dist/components/tabs/interface.d.ts

@@ -7,6 +7,10 @@ export interface TabData {
     disabled?: boolean;
     closable?: boolean;
     slots: Slots;
+    /** tab 自身 id，供 panel 的 aria-labelledby 引用（TabPane 按实例 uid 生成） */
+    tabId?: string;
+    /** 对应 panel 的 id，供 tab 的 aria-controls 引用 */
+    panelId?: string;
 }
 export type TabTriggerEvent = 'click' | 'hover';
 export type ScrollPosition = 'start' | 'end' | 'center' | 'auto' | number;

package/dist/es/components/dropdown/Dropdown.vue2.js

@@ -6,8 +6,8 @@ import { dropdownInjectionKey as O } from "./context.js";
 import { getClassNameMixin as P } from "../../_utils/config.js";
 import T from "../../_container/render-function.js";
 import { useFirstElement as k } from "../../_hooks/use-first-element.js";
-import { mergeFirstChild as K } from "../../_utils/vue-eco.js";
-import { useDropdownKeyboard as x } from "./use-keyboard.js";
+import { mergeFirstChild as x } from "../../_utils/vue-eco.js";
+import { useDropdownKeyboard as K } from "./use-keyboard.js";
 const q = v({
   name: "Dropdown",
   components: {
@@ -153,14 +153,21 @@ const q = v({
       defaultPopupVisible: d,
       popupVisible: s,
       emit: t
-    }), { children: l, firstElement: m } = k(), r = x(
+    }), { children: l, firstElement: m } = k(), r = K(
       a,
       p,
       m
     ), g = (o) => {
       var i;
-      return l.value = ((i = n.default) == null ? void 0 : i.call(n)) ?? [], K(l.value, {
+      return l.value = ((i = n.default) == null ? void 0 : i.call(n)) ?? [], x(l.value, {
         ...o,
+        /*
+         * 根触发器补菜单语义。子菜单的触发器已在 DropdownSubmenu 上声明
+         * aria-haspopup/aria-expanded，根触发器此前没有，读屏无法得知
+         * 这是一个会展开菜单的按钮，也不知道展开状态。
+         */
+        "aria-haspopup": "menu",
+        "aria-expanded": a.value ? "true" : "false",
         onKeydown: (u) => {
           u.key !== "ArrowRight" && r.handleTriggerKeydown(u);
         },

package/dist/es/components/dropdown/DropdownButton.vue.js

@@ -1,13 +1,13 @@
 import d from "./DropdownButton.vue2.js";
-import { resolveComponent as n, openBlock as u, createBlock as c, normalizeClass as i, withCtx as o, createVNode as p, mergeProps as m, renderSlot as s } from "vue";
+import { resolveComponent as n, openBlock as u, createBlock as c, normalizeClass as t, withCtx as o, createVNode as p, mergeProps as m, renderSlot as s } from "vue";
 import b from "../../_virtual/_plugin-vue_export-helper.js";
 function f(e, g, h, C, z, B) {
-  const t = n("Button"), l = n("IconMore"), r = n("Dropdown"), a = n("ButtonGroup");
+  const i = n("Button"), l = n("IconMore"), r = n("Dropdown"), a = n("ButtonGroup");
   return u(), c(a, {
-    class: i(e.className.element("button"))
+    class: t(e.className.element("button"))
   }, {
     default: o(() => [
-      p(t, m({
+      p(i, m({
         size: e.size,
         type: e.type,
         disabled: e.disabled
@@ -30,11 +30,12 @@ function f(e, g, h, C, z, B) {
           s(e.$slots, "content")
         ]),
         default: o(() => [
-          p(t, {
-            class: i(e.className.element("button--trigger")),
+          p(i, {
+            class: t(e.className.element("button--trigger")),
             size: e.size,
             type: e.type,
             disabled: e.disabled,
+            "aria-label": e.t("common.more"),
             narrow: ""
           }, {
             prefix: o(() => [
@@ -43,7 +44,7 @@ function f(e, g, h, C, z, B) {
               ])
             ]),
             _: 3
-          }, 8, ["class", "size", "type", "disabled"])
+          }, 8, ["class", "size", "type", "disabled", "aria-label"])
         ]),
         _: 3
       }, 8, ["popup-visible", "trigger", "position", "popup-container", "hide-on-select", "onSelect", "onPopupVisibleChange"])

package/dist/es/components/dropdown/DropdownButton.vue2.js

@@ -1,16 +1,17 @@
-import { defineComponent as a, toRefs as s } from "vue";
-import d from "../../icons/_self/more-dot.js";
-import { ButtonGroup as c, Button as f } from "../button/index.js";
-import m from "./Dropdown.vue.js";
-import { useTrigger as b } from "../../_hooks/use-trigger.js";
-import { getClassNameMixin as g } from "../../_utils/config.js";
-const P = a({
+import { defineComponent as s, toRefs as d } from "vue";
+import c from "../../icons/_self/more-dot.js";
+import { ButtonGroup as f, Button as m } from "../button/index.js";
+import b from "./Dropdown.vue.js";
+import { useTrigger as g } from "../../_hooks/use-trigger.js";
+import { useLocale as y } from "../../locale/index.js";
+import { getClassNameMixin as h } from "../../_utils/config.js";
+const M = s({
   name: "DropdownButton",
   components: {
-    IconMore: d,
-    Button: f,
-    ButtonGroup: c,
-    Dropdown: m
+    IconMore: c,
+    Button: m,
+    ButtonGroup: f,
+    Dropdown: b
   },
   props: {
     /**
@@ -129,24 +130,25 @@ const P = a({
    * @binding {boolean} popupVisible
    */
   setup(e, { emit: t }) {
-    const { defaultPopupVisible: p, popupVisible: i } = s(e), l = g("dropdown"), { computedPopupVisible: n, handlePopupVisibleChange: r } = b({
+    const { defaultPopupVisible: p, popupVisible: i } = d(e), l = h("dropdown"), { t: n } = y(), { computedPopupVisible: r, handlePopupVisibleChange: u } = g({
       defaultPopupVisible: p,
       popupVisible: i,
       emit: t
     });
     return {
       className: l,
-      computedPopupVisible: n,
+      t: n,
+      computedPopupVisible: r,
       handleClick: (o) => {
         t("click", o);
       },
-      handleSelect: (o, u) => {
-        t("select", o, u);
+      handleSelect: (o, a) => {
+        t("select", o, a);
       },
-      handlePopupVisibleChange: r
+      handlePopupVisibleChange: u
     };
   }
 });
 export {
-  P as default
+  M as default
 };

package/dist/es/components/dropdown/DropdownSubmenu.vue.js

@@ -1,24 +1,25 @@
-import u from "./DropdownSubmenu.vue2.js";
-import { resolveComponent as s, openBlock as f, createBlock as c, withCtx as e, createVNode as p, mergeProps as g, createSlots as r, renderSlot as n, normalizeClass as m } from "vue";
-import b from "../../_virtual/_plugin-vue_export-helper.js";
-function h(o, C, w, $, P, v) {
-  const a = s("IconRight"), t = s("dropdown-option"), l = s("dropdown-panel"), d = s("Trigger");
-  return f(), c(d, {
+import f from "./DropdownSubmenu.vue2.js";
+import { resolveComponent as s, openBlock as c, createBlock as g, withCtx as e, createVNode as p, mergeProps as m, createSlots as a, renderSlot as n, normalizeClass as b } from "vue";
+import h from "../../_virtual/_plugin-vue_export-helper.js";
+function C(o, w, $, P, v, V) {
+  var i;
+  const t = s("IconRight"), l = s("dropdown-option"), d = s("dropdown-panel"), u = s("Trigger");
+  return c(), g(u, {
     "popup-visible": o.computedPopupVisible,
     trigger: o.trigger,
     position: o.position,
-    disabled: o.disabled,
+    disabled: o.disabled || !!((i = o.optionProps) != null && i.disabled),
     "popup-offset": 4,
     onPopupVisibleChange: o.handlePopupVisibleChange,
     onShow: o.handleShow
   }, {
     content: e(() => [
-      p(l, {
+      p(d, {
         ref: "panelRef",
-        class: m(o.className.block),
+        class: b(o.className.block),
         "close-on-arrow-left": "",
         onClose: o.handleClose
-      }, r({
+      }, a({
         default: e(() => [
           n(o.$slots, "content")
         ]),
@@ -34,10 +35,10 @@ function h(o, C, w, $, P, v) {
       ]), 1032, ["class", "onClose"])
     ]),
     default: e(() => {
-      var i;
+      var r;
       return [
-        p(t, g({ ref: "optionRef" }, o.optionProps, {
-          disabled: o.disabled || ((i = o.optionProps) == null ? void 0 : i.disabled),
+        p(l, m({ ref: "optionRef" }, o.optionProps, {
+          disabled: o.disabled || ((r = o.optionProps) == null ? void 0 : r.disabled),
           active: o.computedPopupVisible,
           "uninject-context": "",
           "aria-haspopup": "menu",
@@ -45,10 +46,10 @@ function h(o, C, w, $, P, v) {
           onKeydownCapture: o.handleTriggerKeydown,
           onFocusinCapture: o.handleTriggerFocus,
           onFocusoutCapture: o.handleTriggerFocus
-        }), r({
+        }), a({
           suffix: e(() => [
             n(o.$slots, "suffix", {}, () => [
-              p(a)
+              p(t)
             ])
           ]),
           default: e(() => [
@@ -69,7 +70,7 @@ function h(o, C, w, $, P, v) {
     _: 3
   }, 8, ["popup-visible", "trigger", "position", "disabled", "onPopupVisibleChange", "onShow"]);
 }
-const k = /* @__PURE__ */ b(u, [["render", h]]);
+const y = /* @__PURE__ */ h(f, [["render", C]]);
 export {
-  k as default
+  y as default
 };

package/dist/es/components/menu/MenuSubMenu.js

@@ -1,13 +1,14 @@
-import { defineComponent as x, createVNode as r, mergeProps as y, toRefs as M, computed as a, toRef as h } from "vue";
+import { defineComponent as h, createVNode as s, mergeProps as y, toRefs as x, computed as a, provide as C, toRef as b } from "vue";
 import g from "./sub-menu-inline.vue.js";
-import C from "./sub-menu-pop.vue.js";
-import k from "./hooks/use-menu.js";
-import I from "./hooks/use-level.js";
-import v from "../../icons/_self/menu/down.js";
-import K from "../../icons/_self/dropdown/more.js";
-import P from "./hooks/use-menu-context.js";
-import _ from "./hooks/use-menu-data-collector.js";
-const w = {
+import I from "./sub-menu-pop.vue.js";
+import v from "./hooks/use-menu.js";
+import k from "./hooks/use-level.js";
+import K from "../../icons/_self/menu/down.js";
+import _ from "../../icons/_self/dropdown/more.js";
+import D from "./hooks/use-menu-context.js";
+import P from "./hooks/use-menu-data-collector.js";
+import { DataCollectorInjectionKey as w } from "./context.js";
+const R = {
   /**
    * @zh 子菜单的标题
    * @en The title of the submenu
@@ -51,9 +52,9 @@ const w = {
   _internalSkipCollect: {
     type: Boolean
   }
-}, O = /* @__PURE__ */ x({
+}, q = /* @__PURE__ */ h({
   name: "SubMenu",
-  props: w,
+  props: R,
   slots: Object,
   /**
    * @zh 菜单的图标
@@ -81,47 +82,60 @@ const w = {
   }) {
     const {
       key: n
-    } = k(), {
+    } = v(), {
       level: d
-    } = I(), {
+    } = k(), {
       popup: o
-    } = M(e), t = P(), s = a(() => {
+    } = x(e), t = D(), i = a(() => {
       const {
-        mode: i,
-        collapsed: p,
+        mode: p,
+        collapsed: c,
         inTrigger: m
       } = t;
-      return !!(typeof o.value == "function" ? o.value(d.value) : o.value) || p || m || i !== "vertical";
+      return !!(typeof o.value == "function" ? o.value(d.value) : o.value) || c || m || p !== "vertical";
     }), {
       subMenuKeys: l,
       menuItemKeys: f
     } = e._internalSkipCollect ? {
       subMenuKeys: a(() => []),
       menuItemKeys: a(() => [])
-    } : _({
+    } : P({
       key: n.value,
       type: "subMenu"
-    }), b = a(() => {
-      const i = t.selectedKeys || [], p = (m) => {
-        for (let c = 0; c < i.length; c++) {
-          const S = i[c];
+    });
+    e._internalSkipCollect && C(w, {
+      collectSubMenu: () => {
+      },
+      removeSubMenu: () => {
+      },
+      collectMenuItem: () => {
+      },
+      removeMenuItem: () => {
+      },
+      reportMenuData: () => {
+      }
+    });
+    const M = a(() => {
+      const p = t.selectedKeys || [], c = (m) => {
+        for (let r = 0; r < p.length; r++) {
+          const S = p[r];
           if (m.includes(S))
             return !0;
         }
         return !1;
       };
-      return p(l.value) || p(f.value);
+      return c(l.value) || c(f.value);
     });
     return {
       subMenuKeys: l,
       menuItemKeys: f,
-      isChildrenSelected: b,
+      isChildrenSelected: M,
       props: e,
       attrs: u,
       computedKey: n,
-      computedPopup: s,
-      expandIconDown: h(t, "expandIconDown"),
-      expandIconRight: h(t, "expandIconRight")
+      computedPopup: i,
+      expandIconDown: b(t, "expandIconDown"),
+      expandIconRight: b(t, "expandIconRight")
     };
   },
   render() {
@@ -132,30 +146,30 @@ const w = {
       computedPopup: d,
       expandIconDown: o,
       expandIconRight: t,
-      isChildrenSelected: s
+      isChildrenSelected: i
     } = this, l = {
       ...this.$slots,
-      "expand-icon-down": this.$slots["expand-icon-down"] || o || (() => [r(v, null, null)]),
-      "expand-icon-right": this.$slots["expand-icon-right"] || t || (() => [r(K, null, null)])
+      "expand-icon-down": this.$slots["expand-icon-down"] || o || (() => [s(K, null, null)]),
+      "expand-icon-right": this.$slots["expand-icon-right"] || t || (() => [s(_, null, null)])
     };
-    return d ? r(C, y({
+    return d ? s(I, y({
       key: n,
       title: e.title,
       selectable: e.selectable,
       disabled: e.disabled,
-      isChildrenSelected: s,
+      isChildrenSelected: i,
       popupMaxHeight: e.popupMaxHeight,
       _internalSkipCollect: e._internalSkipCollect
-    }, u), l) : r(g, y({
+    }, u), l) : s(g, y({
       key: n,
       title: e.title,
       disabled: e.disabled,
-      isChildrenSelected: s,
+      isChildrenSelected: i,
       _internalSkipCollect: e._internalSkipCollect
     }, u), l);
   }
 });
 export {
-  O as default,
-  w as menuSubMenuProps
+  q as default,
+  R as menuSubMenuProps
 };

package/dist/es/components/menu/sub-menu-pop.vue2.js

@@ -2,10 +2,10 @@ import { defineComponent as S, toRefs as B, computed as o, ref as P } from "vue"
 import { Trigger as $ } from "../trigger/index.js";
 import H from "./base-menu.vue.js";
 import N from "./hooks/use-menu.js";
-import I from "./hooks/use-level.js";
-import { omit as K } from "../../_utils/omit.js";
-import V from "./indent.vue.js";
-import _ from "./hooks/use-menu-context.js";
+import _ from "./hooks/use-level.js";
+import { omit as I } from "../../_utils/omit.js";
+import K from "./indent.vue.js";
+import V from "./hooks/use-menu-context.js";
 import R from "../../_container/render-function.js";
 import { isNumber as T } from "../../_utils/is.js";
 import { getClassNameMixin as w } from "../../_utils/config.js";
@@ -14,7 +14,7 @@ const Q = S({
   components: {
     Menu: H,
     Trigger: $,
-    MenuIndent: V,
+    MenuIndent: K,
     RenderFunction: R
   },
   inheritAttrs: !1,
@@ -39,57 +39,57 @@ const Q = S({
       type: Boolean
     }
   },
-  setup(g) {
-    const { key: l } = N(), { level: i } = I(), { selectable: a, disabled: u, isChildrenSelected: C, popupMaxHeight: x } = B(g), t = _(), { onSubMenuClick: r, onMenuItemClick: n } = t, p = o(() => t.prefixCls), m = o(() => t.mode), c = o(() => t.selectedKeys || []), s = o(() => `${p.value}-pop`), f = o(
-      () => a.value && c.value.includes(l.value) || C.value
+  setup(s) {
+    const { key: l } = N(), { level: a } = _(), { selectable: u, disabled: p, isChildrenSelected: C, popupMaxHeight: x } = B(s), t = V(), { onSubMenuClick: r, onMenuItemClick: n } = t, m = o(() => t.prefixCls), c = o(() => t.mode), f = o(() => t.selectedKeys || []), i = o(() => `${m.value}-pop`), v = o(
+      () => u.value && f.value.includes(l.value) || C.value
     ), M = o(() => [
-      `${s.value}`,
-      `${s.value}-header`,
+      `${i.value}`,
+      `${i.value}-header`,
       {
-        [`${p.value}-selected`]: f.value
+        [`${m.value}-selected`]: v.value
       }
-    ]), h = o(() => m.value === "horizontal" && !t.inTrigger), v = P(!1), d = (e) => {
-      v.value = e;
-    }, y = w("trigger"), b = o(() => {
+    ]), h = o(() => c.value === "horizontal" && !t.inTrigger), d = P(!1), g = (e) => {
+      d.value = e;
+    }, y = w("trigger"), k = o(() => {
       var e;
       return [
-        `${s.value}-trigger`,
+        `${i.value}-trigger`,
         {
-          [`${s.value}-trigger-dark`]: t.theme === "dark"
+          [`${i.value}-trigger-dark`]: t.theme === "dark"
         },
         // @ts-ignore
         (e = t.triggerProps) == null ? void 0 : e.class
       ];
-    }), k = o(() => K(t.triggerProps || {}, ["class"]));
+    }), b = o(() => I(t.triggerProps || {}, ["class"]));
     return {
-      menuPrefixCls: p,
-      mode: m,
-      level: i,
+      menuPrefixCls: m,
+      mode: c,
+      level: a,
       classNames: M,
-      isSelected: f,
-      disabled: u,
-      selectedKeys: c,
+      isSelected: v,
+      disabled: p,
+      selectedKeys: f,
       needPopOnBottom: h,
-      popVisible: v,
+      popVisible: d,
       className: y,
-      triggerClassNames: b,
-      triggerProps: k,
+      triggerClassNames: k,
+      triggerProps: b,
       menuContext: t,
       popupMenuStyles: o(() => {
         const e = x.value ?? t.popupMaxHeight;
         return T(e) ? { maxHeight: `${e}px` } : e ? {} : { maxHeight: "unset" };
       }),
       onClick: () => {
-        u.value || (r && r(l.value, i.value), a.value && n && n(l.value));
+        p.value || s._internalSkipCollect || (r && r(l.value, a.value), u.value && n && n(l.value));
       },
       onKeydown: (e) => {
-        u.value || (e.key === "Enter" || e.key === " ") && (e.preventDefault(), r && r(l.value, i.value), a.value && n && n(l.value));
+        p.value || s._internalSkipCollect || (e.key === "Enter" || e.key === " ") && (e.preventDefault(), r && r(l.value, a.value), u.value && n && n(l.value));
       },
       onMenuItemClick: (e) => {
-        n && n(e), d(!1);
+        n && n(e), g(!1);
       },
       onVisibleChange: (e) => {
-        d(e);
+        g(e);
       }
     };
   }