fix: fix merge bug

tusen-ai · Aug 15, 2022 · 14dba66 · 14dba66
1 parent ea5ec8b
commit 14dba66
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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<string | number> = []
     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<string | number> = []
-    targetOptionsRef.value.forEach((option) => {
+    filteredSrcOptionsRef.value.forEach((option) => {
       if (!option.disabled) {
         values.push(option.value)
       }