fix(QTree): #7701 with "noSelectionUnset" QTree can't emit null (#12055)

super-seo · rstoenescu · web-flow · commit 05f407a70ee9 · 2022-01-17T20:25:04.000+02:00
* fix: Adding an extra props "unSelectable" to QTree (fix #7701) * Update QTree.js * fix: with "noSelectionUnset" QTree can't emit null (fix #7701) * Update QTree.js Co-authored-by: Razvan Stoenescu <razvan.stoenescu@gmail.com>
diff --git a/ui/src/components/tree/QTree.js b/ui/src/components/tree/QTree.js
@@ -617,9 +617,11 @@ export default createComponent({
 
       if (hasSelection.value) {
         if (meta.selectable) {
-          const val = meta.key !== props.selected ? meta.key : null
-          if (props.noSelectionUnset !== true || val !== null) {
-            emit('update:selected', val)
+          if (props.noSelectionUnset === false) {
+            emit('update:selected', meta.key !== props.selected ? meta.key : null)
+          }
+          else if (meta.key !== props.selected) {
+            emit('update:selected', meta.key || null)
           }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -617,9 +617,11 @@ export default createComponent({`
`617`	`617`
`618`	`618`	`if (hasSelection.value) {`
`619`	`619`	`if (meta.selectable) {`
`620`		`- const val = meta.key !== props.selected ? meta.key : null`
`621`		`- if (props.noSelectionUnset !== true \|\| val !== null) {`
`622`		`- emit('update:selected', val)`
	`620`	`+ if (props.noSelectionUnset === false) {`
	`621`	`+ emit('update:selected', meta.key !== props.selected ? meta.key : null)`
	`622`	`+ }`
	`623`	`+ else if (meta.key !== props.selected) {`
	`624`	`+ emit('update:selected', meta.key \|\| null)`
`623`	`625`	`}`
`624`	`626`	`}`
`625`	`627`	`}`