fix(transfer): fix tree disabled and drag sort bug (#3412)

uyarn · web-flow · commit 913a944048ed · 2024-12-05T16:11:56.000+08:00
* fix(transfer): fix tree disabled and drag sort bug

* chore: revert demo change
diff --git a/src/transfer/components/transfer-list.tsx b/src/transfer/components/transfer-list.tsx
@@ -265,10 +265,6 @@ export default mixins(keepAnimationMixins, classPrefixMixins).extend({
 
       newData.splice(sourceIndex, 1);
 
-      if (draggingIndex < dragoverIndex) {
-        targetIndex -= 1;
-      }
-
       if (dragoverPos === 'bottom') {
         targetIndex += 1;
       }
diff --git a/src/transfer/utils.ts b/src/transfer/utils.ts
@@ -56,7 +56,7 @@ function getDataValues(
     if (data) {
       for (let i = 0; i < data.length; i++) {
         const item = data[i];
-        const isInclude = filterValues.includes(item.value);
+        const isInclude = filterValues.includes(item.value) && !item.disabled;
         if (!include && isInclude) {
           continue; // 排除模式下子元素一律排除
         }

Original file line number	Diff line number	Diff line change
`@@ -265,10 +265,6 @@ export default mixins(keepAnimationMixins, classPrefixMixins).extend({`
`265`	`265`
`266`	`266`	`newData.splice(sourceIndex, 1);`
`267`	`267`
`268`		`- if (draggingIndex < dragoverIndex) {`
`269`		`- targetIndex -= 1;`
`270`		`- }`
`271`		`-`
`272`	`268`	`if (dragoverPos === 'bottom') {`
`273`	`269`	`targetIndex += 1;`
`274`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function getDataValues(`
`56`	`56`	`if (data) {`
`57`	`57`	`for (let i = 0; i < data.length; i++) {`
`58`	`58`	`const item = data[i];`
`59`		`- const isInclude = filterValues.includes(item.value);`
	`59`	`+ const isInclude = filterValues.includes(item.value) && !item.disabled;`
`60`	`60`	`if (!include && isInclude) {`
`61`	`61`	`continue; // 排除模式下子元素一律排除`
`62`	`62`	`}`