release version

arco-design · Feb 21, 2024 · dda3c06 · dda3c06
1 parent 22755e1
commit dda3c06
Show file tree

Hide file tree

Showing 17 changed files with 118 additions and 13 deletions.
diff --git a/packages/web-vue/CHANGELOG.md b/packages/web-vue/CHANGELOG.md
@@ -2,6 +2,17 @@
 changelog: true
 ```
 
+## 2.54.5
+
+`2024-02-21`
+
+### 🐛 BugFix
+
+- **menu:** Fix warning “Invalid prop name: key is a reserved property.” ([#2978](https://github.com/arco-design/arco-design-vue/pull/2978))
+- **date-picker:** refactor date utility functions and week picker to correctly show selected week ([#2970](https://github.com/arco-design/arco-design-vue/pull/2970))
+- **input-number:** fix v-model not working ([#2961](https://github.com/arco-design/arco-design-vue/pull/2961))
+
+
 ## 2.54.4
 
 `2024-02-02`

diff --git a/packages/web-vue/CHANGELOG.zh-CN.md b/packages/web-vue/CHANGELOG.zh-CN.md
@@ -2,6 +2,17 @@
 changelog: true
 ```
 
+## 2.54.5
+
+`2024-02-21`
+
+### 🐛 问题修复
+
+- **menu:** 修复警告 “Invalid prop name: key is a reserved property.” ([#2978](https://github.com/arco-design/arco-design-vue/pull/2978))
+- **date-picker:** 重构日期 utility 函数和 WeekPicker，以正确显示所选星期 ([#2970](https://github.com/arco-design/arco-design-vue/pull/2970))
+- **input-number:** 修复双向绑定失效 ([#2961](https://github.com/arco-design/arco-design-vue/pull/2961))
+
+
 ## 2.54.4
 
 `2024-02-02`

diff --git a/packages/web-vue/components/date-picker/CHANGELOG.md b/packages/web-vue/components/date-picker/CHANGELOG.md
@@ -2,6 +2,15 @@
 changelog: true
 ```
 
+## 2.54.5
+
+`2024-02-21`
+
+### 🐛 BugFix
+
+- refactor date utility functions and week picker to correctly show selected week ([#2970](https://github.com/arco-design/arco-design-vue/pull/2970))
+
+
 ## 2.54.0
 
 `2023-12-15`

diff --git a/packages/web-vue/components/date-picker/CHANGELOG.zh-CN.md b/packages/web-vue/components/date-picker/CHANGELOG.zh-CN.md
@@ -2,6 +2,14 @@
 changelog: true
 ```
 
+## 2.54.5
+
+`2024-02-21`
+
+### 🐛 问题修复
+
+- 重构日期 utility 函数和 WeekPicker，以正确显示所选星期 ([#2970](https://github.com/arco-design/arco-design-vue/pull/2970))
+
 ## 2.54.0
 
 `2023-12-15`

diff --git a/packages/web-vue/components/input-number/CHANGELOG.md b/packages/web-vue/components/input-number/CHANGELOG.md
@@ -2,6 +2,15 @@
 changelog: true
 ```
 
+## 2.54.5
+
+`2024-02-21`
+
+### 🐛 BugFix
+
+- fix v-model not working ([#2961](https://github.com/arco-design/arco-design-vue/pull/2961))
+
+
 ## 2.54.4
 
 `2024-02-02`

diff --git a/packages/web-vue/components/input-number/CHANGELOG.zh-CN.md b/packages/web-vue/components/input-number/CHANGELOG.zh-CN.md
@@ -2,6 +2,15 @@
 changelog: true
 ```
 
+## 2.54.5
+
+`2024-02-21`
+
+### 🐛 问题修复
+
+- 修复双向绑定失效 ([#2961](https://github.com/arco-design/arco-design-vue/pull/2961))
+
+
 ## 2.54.4
 
 `2024-02-02`

diff --git a/packages/web-vue/components/menu/CHANGELOG.md b/packages/web-vue/components/menu/CHANGELOG.md
@@ -2,6 +2,15 @@
 changelog: true
 ```
 
+## 2.54.5
+
+`2024-02-21`
+
+### 🐛 BugFix
+
+- Fix warning “Invalid prop name: key is a reserved property.” ([#2978](https://github.com/arco-design/arco-design-vue/pull/2978))
+
+
 ## 2.43.0
 
 `2023-02-10`

diff --git a/packages/web-vue/components/menu/CHANGELOG.zh-CN.md b/packages/web-vue/components/menu/CHANGELOG.zh-CN.md
@@ -2,6 +2,15 @@
 changelog: true
 ```
 
+## 2.54.5
+
+`2024-02-21`
+
+### 🐛 问题修复
+
+- 修复警告 “Invalid prop name: key is a reserved property.” ([#2978](https://github.com/arco-design/arco-design-vue/pull/2978))
+
+
 ## 2.43.0
 
 `2023-02-10`

diff --git a/packages/web-vue/components/menu/README.en-US.md b/packages/web-vue/components/menu/README.en-US.md
@@ -73,7 +73,6 @@ description: Organize, arrange, and display a list of options.
 
 |Attribute|Description|Type|Default|version|
 |---|---|---|:---:|:---|
-|key|Unique key|`string`|`-`||
 |title|The title of the submenu|`string`|`-`||
 |selectable|In the pop-up mode, whether the multi-level menu header is also used as a menu item to support the state such as click to select|`boolean`|`false`||
 |popup|Whether to force the use of pop-up mode, `level` indicates the level of the current submenu|`boolean \| ((level: number) => boolean)`|`false`||
@@ -108,7 +107,6 @@ description: Organize, arrange, and display a list of options.
 
 |Attribute|Description|Type|Default|
 |---|---|---|:---:|
-|key|Unique key|`string`|`-`|
 |disabled|Whether to disable|`boolean`|`false`|
 ### `<menu-item>` Slots
 
@@ -117,3 +115,11 @@ description: Organize, arrange, and display a list of options.
 |icon|the icon of menu item|-|2.11.0|
 
 
+
+
+## FAQ
+
+
+### The `key` attribute of `<MenuItem>` and `<SubMenu>` components is required
+When using `<MenuItem>` and `<SubMenu>` components in the `<Menu>` component, please pass in the unique `key` attribute.
+The component will rely on this value when calculating internally. If no value is assigned, some Abnormality in the scene
diff --git a/packages/web-vue/components/menu/README.zh-CN.md b/packages/web-vue/components/menu/README.zh-CN.md
@@ -71,7 +71,6 @@ description: 收纳、排列并展示一系列选项的列表。
 
 |参数名|描述|类型|默认值|版本|
 |---|---|---|:---:|:---|
-|key|唯一标志|`string`|`-`||
 |title|子菜单的标题|`string`|`-`||
 |selectable|弹出模式下，是否将多级菜单头也作为一个菜单项，支持点击选中等状态|`boolean`|`false`||
 |popup|是否强制使用弹出模式，`level` 表示当前子菜单的层级|`boolean \| ((level: number) => boolean)`|`false`||
@@ -106,7 +105,6 @@ description: 收纳、排列并展示一系列选项的列表。
 
 |参数名|描述|类型|默认值|
 |---|---|---|:---:|
-|key|唯一标志|`string`|`-`|
 |disabled|是否禁用|`boolean`|`false`|
 ### `<menu-item>` Slots
 
@@ -115,3 +113,11 @@ description: 收纳、排列并展示一系列选项的列表。
 |icon|菜单的图标|-|2.11.0|
 
 
+
+
+## FAQ
+
+### `<MenuItem>` 和 `<SubMenu>` 组件的 `key` 属性为必填
+在 `<Menu>` 组件中使用 `<MenuItem>` 和 `<SubMenu>` 组件时，请传入唯一的 `key` 属性。
+组件内部在进行计算时会依赖此值，如果没有赋值会导致部分场景下异常
+
diff --git a/packages/web-vue/components/menu/TEMPLATE.md b/packages/web-vue/components/menu/TEMPLATE.md
@@ -42,3 +42,20 @@ description: Organize, arrange, and display a list of options.
 %%API(item-group.vue)%%
 
 %%API(item.tsx)%%
+
+
+## FAQ
+
+## zh-CN
+### `<MenuItem>` 和 `<SubMenu>` 组件的 `key` 属性为必填
+在 `<Menu>` 组件中使用 `<MenuItem>` 和 `<SubMenu>` 组件时，请传入唯一的 `key` 属性。
+组件内部在进行计算时会依赖此值，如果没有赋值会导致部分场景下异常
+
+---
+
+## en-US
+### The `key` attribute of `<MenuItem>` and `<SubMenu>` components is required
+When using `<MenuItem>` and `<SubMenu>` components in the `<Menu>` component, please pass in the unique `key` attribute.
+The component will rely on this value when calculating internally. If no value is assigned, some Abnormality in the scene
+
+---
diff --git a/packages/web-vue/components/menu/base-menu.vue b/packages/web-vue/components/menu/base-menu.vue
@@ -32,7 +32,6 @@ import IconMenuUnfold from '../icon/icon-menu-unfold';
 import useMergeState from '../_hooks/use-merge-state';
 import { provideLevel } from './hooks/use-level';
 import { MenuInjectionKey } from './context';
-import { InternalMenuProps } from './interface';
 import usePickSlots from '../_hooks/use-pick-slots';
 import { omit } from '../_utils/omit';
 import useMenuDataCollector from './hooks/use-menu-data-collector';
@@ -262,7 +261,7 @@ export default defineComponent({
    * @en Icon expand right
    * @slot expand-icon-right
    */
-  setup(props: InternalMenuProps, { emit, slots }) {
+  setup(props, { emit, slots }) {
     const {
       style,
       mode,

diff --git a/packages/web-vue/components/menu/interface.ts b/packages/web-vue/components/menu/interface.ts
@@ -1,6 +1,7 @@
 import { StyleValue } from 'vue';
 import { Breakpoint } from '../_utils/responsive-observe';
 import { Data } from '../_utils/types';
+import { TriggerProps } from '../trigger';
 
 export type MenuTheme = 'light' | 'dark';
 
@@ -30,7 +31,7 @@ export interface MenuProps {
   openKeys: string[] | undefined;
   defaultOpenKeys: string[];
   scrollConfig: { [key: string]: any } | undefined;
-  triggerProps: Data | undefined;
+  triggerProps: TriggerProps | undefined;
   tooltipProps: Data | undefined;
   autoOpenSelected: boolean;
   breakpoint: Breakpoint | undefined;
@@ -45,6 +46,7 @@ export interface InternalMenuProps extends MenuProps {
 }
 
 export interface SubMenuProps {
+  key: string | undefined;
   title: string | undefined;
   selectable: boolean;
   popup: boolean | ((level: number) => boolean);
@@ -56,6 +58,7 @@ export interface MenuItemGroupProps {
 }
 
 export interface MenuItemProps {
+  key: string | undefined;
   disabled?: boolean;
 }
 

diff --git a/packages/web-vue/components/menu/item.tsx b/packages/web-vue/components/menu/item.tsx
@@ -8,7 +8,6 @@ import {
 } from 'vue';
 import scrollIntoView from 'scroll-into-view-if-needed';
 import Tooltip from '../tooltip';
-import { MenuItemProps } from './interface';
 import useMenu from './hooks/use-menu';
 import useLevel from './hooks/use-level';
 import { omit } from '../_utils/omit';
@@ -36,7 +35,7 @@ export default defineComponent({
    * @slot icon
    * @version 2.11.0
    */
-  setup(props: MenuItemProps, { emit }) {
+  setup(props, { emit }) {
     const { key } = useMenu();
     const { level } = useLevel();
     const menuContext = useMenuContext();

diff --git a/packages/web-vue/components/menu/sub-menu-pop.vue b/packages/web-vue/components/menu/sub-menu-pop.vue
@@ -110,7 +110,7 @@ export default defineComponent({
       default: undefined,
     },
   },
-  setup(props: SubMenuPopProps) {
+  setup(props) {
     const { key } = useMenu();
     const { level } = useLevel();
     const { selectable, isChildrenSelected, popupMaxHeight } = toRefs(props);
@@ -147,6 +147,7 @@ export default defineComponent({
       {
         [`${prefixCls.value}-trigger-dark`]: menuContext.theme === 'dark',
       },
+      // @ts-ignore
       menuContext.triggerProps?.class,
     ]);
     const triggerProps = computed(() =>

diff --git a/packages/web-vue/components/menu/sub-menu.tsx b/packages/web-vue/components/menu/sub-menu.tsx
@@ -1,5 +1,4 @@
 import { computed, defineComponent, PropType, toRef, toRefs } from 'vue';
-import { SubMenuProps } from './interface';
 import SubMenuInline from './sub-menu-inline.vue';
 import SubMenuPop from './sub-menu-pop.vue';
 import useMenu from './hooks/use-menu';
@@ -68,7 +67,7 @@ export default defineComponent({
    * @en Title
    * @slot title
    */
-  setup(props: SubMenuProps, { attrs }) {
+  setup(props, { attrs }) {
     const { key } = useMenu();
     const { level } = useLevel();
     const { popup } = toRefs(props);

diff --git a/packages/web-vue/package.json b/packages/web-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@arco-design/web-vue",
-  "version": "2.54.4",
+  "version": "2.54.5",
   "description": "Arco Design Vue 2.0: A Vue.js 3 UI Library",
   "keywords": [
     "arco",