From 95387a7b59c85bd67ace05ee16bbf3fee858b38a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E6=B3=BD=E5=9D=A4?= <984757534@qq.com> Date: Tue, 12 Nov 2024 13:45:50 +0800 Subject: [PATCH 1/4] fix(transfer): `target-filter-placeholder` prop doesn't work --- CHANGELOG.en-US.md | 1 + CHANGELOG.zh-CN.md | 1 + src/transfer/src/Transfer.tsx | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 74daffee2d1..bddd10e8473 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -9,6 +9,7 @@ - Fix `n-time-picker`'s `use-12-hours` type error warning, closes [#4308](https://github.com/tusen-ai/naive-ui/issues/4308) - Fix `input-number` the problem that the negative sign is replaced when the negative sign is entered. - Fix `n-data-table`'s header will show scrollbar in some old browsers, closes [#6557](https://github.com/tusen-ai/naive-ui/issues/6557). +- Fix `n-transfer`'s `target-filter-placeholder` prop not working, closes [#6537](https://github.com/tusen-ai/naive-ui/issues/6537) ### Features diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 6cf9772ae01..fc360fca6f5 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -9,6 +9,7 @@ - `n-time-picker` 的 `use-12-hours` 类型错误警告，关闭 [#4308](https://github.com/tusen-ai/naive-ui/issues/4308) - 修复 `input-number` 存在负号时被替换的问题 - 修复 `n-data-table` 的 header 在部分浏览器中会出现滚动条，关闭 [#6557](https://github.com/tusen-ai/naive-ui/issues/6557) +- 修复 `n-transfer` 的 `target-filter-placeholder` 属性不生效，关闭 [#6537](https://github.com/tusen-ai/naive-ui/issues/6537) ### Features diff --git a/src/transfer/src/Transfer.tsx b/src/transfer/src/Transfer.tsx index c381a74bc19..442551d4f8b 100644 --- a/src/transfer/src/Transfer.tsx +++ b/src/transfer/src/Transfer.tsx @@ -370,7 +370,7 @@ export default defineComponent({ onUpdateValue={this.handleTgtFilterUpdateValue} value={this.tgtPattern} disabled={this.mergedDisabled} - placeholder={this.sourceFilterPlaceholder} + placeholder={this.targetFilterPlaceholder} /> ) : null}
From fde3cdfb37742a3860db6d2c4be018a5aaa5722c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E6=B3=BD=E5=9D=A4?= <984757534@qq.com> Date: Tue, 26 Nov 2024 08:44:14 +0800 Subject: [PATCH 2/4] chore: update changelog --- CHANGELOG.en-US.md | 11 ++++++++++- CHANGELOG.zh-CN.md | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index bddd10e8473..9b3f7fafda7 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,15 @@ # CHANGELOG +## NEXT_VERSION + +`xxxx-xx-xx` + +### Fixes + +- Fix `n-transfer`'s `target-filter-placeholder` prop not working, closes [#6537](https://github.com/tusen-ai/naive-ui/issues/6537). + +### Features + ## 2.40.2 `2024-11-26` @@ -9,7 +19,6 @@ - Fix `n-time-picker`'s `use-12-hours` type error warning, closes [#4308](https://github.com/tusen-ai/naive-ui/issues/4308) - Fix `input-number` the problem that the negative sign is replaced when the negative sign is entered. - Fix `n-data-table`'s header will show scrollbar in some old browsers, closes [#6557](https://github.com/tusen-ai/naive-ui/issues/6557). -- Fix `n-transfer`'s `target-filter-placeholder` prop not working, closes [#6537](https://github.com/tusen-ai/naive-ui/issues/6537) ### Features diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index fc360fca6f5..d9fd343e0c3 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,15 @@ # CHANGELOG +## NEXT_VERSION + +`xxxx-xx-xx` + +### Fixes + +- 修复 `n-transfer` 的 `target-filter-placeholder` 属性不生效，关闭 [#6537](https://github.com/tusen-ai/naive-ui/issues/6537) + +### Features + ## 2.40.2 `2024-11-26` @@ -9,7 +19,6 @@ - `n-time-picker` 的 `use-12-hours` 类型错误警告，关闭 [#4308](https://github.com/tusen-ai/naive-ui/issues/4308) - 修复 `input-number` 存在负号时被替换的问题 - 修复 `n-data-table` 的 header 在部分浏览器中会出现滚动条，关闭 [#6557](https://github.com/tusen-ai/naive-ui/issues/6557) -- 修复 `n-transfer` 的 `target-filter-placeholder` 属性不生效，关闭 [#6537](https://github.com/tusen-ai/naive-ui/issues/6537) ### Features From 3946f990f76f6fe665f565d6023ad51c37489ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E6=B3=BD=E5=9D=A4?= <984757534@qq.com> Date: Tue, 12 Nov 2024 13:45:50 +0800 Subject: [PATCH 3/4] fix(transfer): `target-filter-placeholder` prop doesn't work --- CHANGELOG.en-US.md | 1 + CHANGELOG.zh-CN.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 9b3f7fafda7..7c2f7105d15 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -19,6 +19,7 @@ - Fix `n-time-picker`'s `use-12-hours` type error warning, closes [#4308](https://github.com/tusen-ai/naive-ui/issues/4308) - Fix `input-number` the problem that the negative sign is replaced when the negative sign is entered. - Fix `n-data-table`'s header will show scrollbar in some old browsers, closes [#6557](https://github.com/tusen-ai/naive-ui/issues/6557). +- Fix `n-transfer`'s `target-filter-placeholder` prop not working, closes [#6537](https://github.com/tusen-ai/naive-ui/issues/6537) ### Features diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index d9fd343e0c3..4b5c7aea129 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -19,6 +19,7 @@ - `n-time-picker` 的 `use-12-hours` 类型错误警告，关闭 [#4308](https://github.com/tusen-ai/naive-ui/issues/4308) - 修复 `input-number` 存在负号时被替换的问题 - 修复 `n-data-table` 的 header 在部分浏览器中会出现滚动条，关闭 [#6557](https://github.com/tusen-ai/naive-ui/issues/6557) +- 修复 `n-transfer` 的 `target-filter-placeholder` 属性不生效，关闭 [#6537](https://github.com/tusen-ai/naive-ui/issues/6537) ### Features From 72e9c736b7bf33059684130a2a68e75a6c3cc5ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E6=B3=BD=E5=9D=A4?= <984757534@qq.com> Date: Tue, 26 Nov 2024 08:44:14 +0800 Subject: [PATCH 4/4] chore: update changelog --- CHANGELOG.en-US.md | 1 - CHANGELOG.zh-CN.md | 1 - 2 files changed, 2 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 7c2f7105d15..9b3f7fafda7 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -19,7 +19,6 @@ - Fix `n-time-picker`'s `use-12-hours` type error warning, closes [#4308](https://github.com/tusen-ai/naive-ui/issues/4308) - Fix `input-number` the problem that the negative sign is replaced when the negative sign is entered. - Fix `n-data-table`'s header will show scrollbar in some old browsers, closes [#6557](https://github.com/tusen-ai/naive-ui/issues/6557). -- Fix `n-transfer`'s `target-filter-placeholder` prop not working, closes [#6537](https://github.com/tusen-ai/naive-ui/issues/6537) ### Features diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 4b5c7aea129..d9fd343e0c3 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -19,7 +19,6 @@ - `n-time-picker` 的 `use-12-hours` 类型错误警告，关闭 [#4308](https://github.com/tusen-ai/naive-ui/issues/4308) - 修复 `input-number` 存在负号时被替换的问题 - 修复 `n-data-table` 的 header 在部分浏览器中会出现滚动条，关闭 [#6557](https://github.com/tusen-ai/naive-ui/issues/6557) -- 修复 `n-transfer` 的 `target-filter-placeholder` 属性不生效，关闭 [#6537](https://github.com/tusen-ai/naive-ui/issues/6537) ### Features