Merge pull request #576 from gaetandezeiraud/fix-flunavigationview-nostackpush

zhuzichu520 · web-flow · commit a8ca78f3f154 · 2024-12-01T19:52:11.000+08:00
Fix FluNavigationView noStackPush
diff --git a/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml b/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml
@@ -1313,7 +1313,7 @@ Item {
             d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex])
         }
         function noStackPush(){
-            if(loader_content.source.toString() === url){
+            if(loader_content.source.toString() === url && Object.keys(argument).length === 0){
                 return
             }
             loader_content.setSource(url,argument)
diff --git a/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml b/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml
@@ -1314,7 +1314,7 @@ Item {
             d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex])
         }
         function noStackPush(){
-            if(loader_content.source.toString() === url){
+            if(loader_content.source.toString() === url && Object.keys(argument).length === 0){
                 return
             }
             loader_content.setSource(url,argument)

Original file line number	Diff line number	Diff line change
`@@ -1313,7 +1313,7 @@ Item {`
`1313`	`1313`	`d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex])`
`1314`	`1314`	`}`
`1315`	`1315`	`function noStackPush(){`
`1316`		`- if(loader_content.source.toString() === url){`
	`1316`	`+ if(loader_content.source.toString() === url && Object.keys(argument).length === 0){`
`1317`	`1317`	`return`
`1318`	`1318`	`}`
`1319`	`1319`	`loader_content.setSource(url,argument)`
Original file line number	Diff line number	Diff line change
`@@ -1314,7 +1314,7 @@ Item {`
`1314`	`1314`	`d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex])`
`1315`	`1315`	`}`
`1316`	`1316`	`function noStackPush(){`
`1317`		`- if(loader_content.source.toString() === url){`
	`1317`	`+ if(loader_content.source.toString() === url && Object.keys(argument).length === 0){`
`1318`	`1318`	`return`
`1319`	`1319`	`}`
`1320`	`1320`	`loader_content.setSource(url,argument)`