From dbd4b95ae5c9d7e79a884969c6786bdaf213fb08 Mon Sep 17 00:00:00 2001 From: Tyh2001 <1469442737@qq.com> Date: Wed, 12 Jun 2024 11:27:52 +0800 Subject: [PATCH] revert: 1.0.0-alpha.8 (2024-06-12) --- CHANGELOG.en-US.md | 5 +++++ CHANGELOG.md | 3 +++ docs/docs/changelog.md | 5 +++++ packages/fighting-design/link/src/link.vue | 5 +++++ packages/fighting-design/package.json | 2 +- 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 92cd4e1fb9..3b9757232d 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -4,6 +4,11 @@ English | [Chinese](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.md) +## 1.0.0 alpha.8 (2024-06-12) + +- Fix the issue of `f-image` and `f-avatar` components being squeezed +- Fix the issue of inability to execute events in the `f-link` components `no-link` state + ## 1.0.0-alpha.7 (2024-05-24) - Add callback parameters to the `f-select` component `on-before-change` configuration item diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a04e6f993..6a0190999c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md) +## 1.0.0-alpha.8 (2024-06-12) + - 修复 `f-image` 和 `f-avatar` 组件被挤压的问题 +- 修复 `f-link` 组件 `no-link` 状态下无法执行事件的问题 ## 1.0.0-alpha.7 (2024-05-24) diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index 3b249cb245..6a0190999c 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -2,6 +2,11 @@ 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md) +## 1.0.0-alpha.8 (2024-06-12) + +- 修复 `f-image` 和 `f-avatar` 组件被挤压的问题 +- 修复 `f-link` 组件 `no-link` 状态下无法执行事件的问题 + ## 1.0.0-alpha.7 (2024-05-24) - `f-select` 组件 `on-before-change` 配置项新增回调参数 diff --git a/packages/fighting-design/link/src/link.vue b/packages/fighting-design/link/src/link.vue index 7a344a71e2..183f7d827f 100644 --- a/packages/fighting-design/link/src/link.vue +++ b/packages/fighting-design/link/src/link.vue @@ -24,8 +24,13 @@ * @see event.preventDefault https://developer.mozilla.org/zh-CN/docs/Web/API/Event/preventDefault */ evt.preventDefault() + } + + // 只有在禁用状态下需要返回,跳转状态下继续执行事件 + if (prop.disabled) { return } + run(prop.onClick, evt) } diff --git a/packages/fighting-design/package.json b/packages/fighting-design/package.json index e28fe0f0ec..5f66e8b2d4 100644 --- a/packages/fighting-design/package.json +++ b/packages/fighting-design/package.json @@ -1,6 +1,6 @@ { "name": "fighting-design", - "version": "1.0.0-alpha.7", + "version": "1.0.0-alpha.8", "description": "Fighting design can quickly build interactive interfaces in vue3 applications, which looks good.", "keywords": [ "fighting",