From 14dba66a0a2ae6d792aa470f937b8e607175b1b0 Mon Sep 17 00:00:00 2001 From: XieZongChen <952937570@qq.com> Date: Mon, 15 Aug 2022 22:51:34 +0800 Subject: [PATCH] fix: fix merge bug --- src/transfer/src/use-transfer-data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/transfer/src/use-transfer-data.ts b/src/transfer/src/use-transfer-data.ts index 62371ff895a..0090e92106d 100644 --- a/src/transfer/src/use-transfer-data.ts +++ b/src/transfer/src/use-transfer-data.ts @@ -74,7 +74,7 @@ export function useTransferData (props: UseTransferDataProps) { const mergedValueSet = mergedValueSetRef.value const values: Array = [] filteredSrcOptionsRef.value.forEach((option) => { - if (!option.disabled || !mergedValueSet.has(option.value)) { + if (!option.disabled && !mergedValueSet.has(option.value)) { values.push(option.value) } }) @@ -83,7 +83,7 @@ export function useTransferData (props: UseTransferDataProps) { const valueSetForUnselectAllRef = computed(() => { const values: Array = [] - targetOptionsRef.value.forEach((option) => { + filteredSrcOptionsRef.value.forEach((option) => { if (!option.disabled) { values.push(option.value) }