File tree Expand file tree Collapse file tree 3 files changed +11
-3
lines changed
tdesign-vue-next/.changelog Expand file tree Collapse file tree 3 files changed +11
-3
lines changed Original file line number Diff line number Diff line change 77 transition
88 expand-all
99 draggable
10+ check-strictly
1011 :allow-drop =" handleAllowDrop"
1112 @drag-start =" handleDragStart"
1213 @drag-end =" handleDragEnd"
@@ -49,6 +50,7 @@ const items = ref([
4950 {
5051 value: ' 1.1.2.1' ,
5152 label: ' 1.1.2.1' ,
53+ disabled: true ,
5254 },
5355 {
5456 value: ' 1.1.2.2' ,
@@ -70,7 +72,7 @@ const items = ref([
7072 },
7173 {
7274 value: ' 2.2' ,
73- label: ' 2.2 不允许拖放为 2.2 的子节点 ' ,
75+ label: ' 2.2 (不允许其它节点拖放为其子节点) ' ,
7476 },
7577 ],
7678 },
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ export default function useTreeItem(state: TypeTreeItemState) {
7676 [ `${ classPrefix } -is-disabled` ] : node . isDisabled ( ) ,
7777 } ) ;
7878 list . push ( {
79- [ `${ componentName } __item--draggable` ] : node . isDraggable ( ) ,
79+ [ `${ componentName } __item--draggable` ] : ! node . isDisabled ( ) && node . isDraggable ( ) ,
8080 } ) ;
8181 if ( node . visible ) {
8282 list . push ( `${ componentName } __item--visible` ) ;
@@ -143,7 +143,7 @@ export default function useTreeItem(state: TypeTreeItemState) {
143143 data-level = { level }
144144 style = { styles }
145145 onClick = { ( evt : MouseEvent ) => handleClick ( evt ) }
146- draggable = { node . isDraggable ( ) }
146+ draggable = { ! node . isDisabled ( ) && node . isDraggable ( ) }
147147 onDragstart = { ( evt : DragEvent ) => handleDragStart ( evt ) }
148148 onDragend = { ( evt : DragEvent ) => handleDragEnd ( evt ) }
149149 onDragover = { ( evt : DragEvent ) => handleDragOver ( evt ) }
Original file line number Diff line number Diff line change 1+ ---
2+ pr_number : 5914
3+ contributor : RylanBot
4+ ---
5+
6+ - fix(Tree): 修复 draggable 在 disabled 状态下依旧生效的异常,此前有依赖此错误的业务请注意此变动 ⚠️ @RylanBot ([ #5914 ] ( https://github.com/Tencent/tdesign-vue-next/pull/5914 ) )
You can’t perform that action at this time.
0 commit comments