From 0810572e2727356a3da55f249f181b2ecfeb98ad Mon Sep 17 00:00:00 2001 From: zhuzichu Date: Fri, 14 Jul 2023 16:15:25 +0800 Subject: [PATCH] update --- example/qml/page/T_TimePicker.qml | 10 +++++----- example/qml/window/MainWindow.qml | 2 +- src/imports/FluentUI/Controls/FluNavigationView.qml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/example/qml/page/T_TimePicker.qml b/example/qml/page/T_TimePicker.qml index 2acadd32..3f3ee9ae 100644 --- a/example/qml/page/T_TimePicker.qml +++ b/example/qml/page/T_TimePicker.qml @@ -8,7 +8,7 @@ import "qrc:///example/qml/component" FluScrollablePage{ title:"TimePicker" - + launchMode: FluPage.SingleInstance FluArea{ Layout.fillWidth: true Layout.topMargin: 20 @@ -60,10 +60,10 @@ FluScrollablePage{ } FluTimePicker{ - hourFormat:FluTimePicker.HH - onCurrentChanged: { - showSuccess(current.toLocaleTimeString(Qt.locale("de_DE"))) - } + hourFormat:FluTimePicker.HH + onCurrentChanged: { + showSuccess(current.toLocaleTimeString(Qt.locale("de_DE"))) + } } } diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml index 2e7fa7e5..f2ebbd51 100644 --- a/example/qml/window/MainWindow.qml +++ b/example/qml/window/MainWindow.qml @@ -175,7 +175,7 @@ CustomWindow { //Stack模式,每次切换都会将页面压入栈中,随着栈的页面增多,消耗的内存也越多,内存消耗多就会卡顿,这时候就需要按返回将页面pop掉,释放内存。该模式可以配合FluPage中的launchMode属性,设置页面的启动模式 // pageMode: FluNavigationView.Stack //NoStack模式,每次切换都会销毁之前的页面然后创建一个新的页面,只需消耗少量内存(推荐) - pageMode: FluNavigationView.NoStack +// pageMode: FluNavigationView.NoStack items: ItemsOriginal footerItems:ItemsFooter topPadding:FluTools.isMacos() ? 20 : 5 diff --git a/src/imports/FluentUI/Controls/FluNavigationView.qml b/src/imports/FluentUI/Controls/FluNavigationView.qml index 57cc1e17..1c98a0ae 100644 --- a/src/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/imports/FluentUI/Controls/FluNavigationView.qml @@ -525,7 +525,7 @@ Item { nav_list.currentIndex = item._idx if(pageMode === FluNavigationView.Stack){ var nav_stack = loader_content.item.navStack() - var nav_stack2 = loader_content.item.navStack() + var nav_stack2 = loader_content.item.navStack2() nav_stack.pop() if(nav_stack.currentItem.launchMode === FluPage.SingleInstance){ var url = nav_stack.currentItem.url