update

2025-07-01 15:42:20 +08:00 · 2024-03-27 00:36:56 +08:00
parent 485bcc8acc
commit e81a2cc849
42 changed files with 412 additions and 635 deletions
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@ -49,13 +49,9 @@ configure_file(
 )

 #遍历所有Cpp文件
-
-message("---------->${filename}")
 file(GLOB_RECURSE CPP_FILES *.cpp *.h)
 foreach(filepath ${CPP_FILES})
    string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
-
-    message(${filename})
    list(APPEND sources_files ${filename})
 endforeach(filepath)

--- a/example/example.qrc
+++ b/example/example.qrc
@ -181,8 +181,6 @@
        <file>res/image/image_1.jpg</file>
        <file>qml/window/PageWindow.qml</file>
        <file>qml/page/T_StaggeredLayout.qml</file>
-        <file>qml/viewmodel/SettingsViewModel.qml</file>
-        <file>qml/viewmodel/TextBoxViewModel.qml</file>
        <file>qml/page/T_Clip.qml</file>
        <file>qml/page/T_3D.qml</file>
        <file>qml/page/T_Network.qml</file>
@ -208,5 +206,6 @@
        <file>res/template/src/qml.qrc.in</file>
        <file>res/template/src/zh_CN.ts.in</file>
        <file>res/template/src/README.md.in</file>
+        <file>qml/global/GlobalModel.qml</file>
    </qresource>
 </RCC>
--- a/example/example_en_US.ts
+++ b/example/example_en_US.ts
@ -535,104 +535,104 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="322"/>
+        <location filename="qml/window/MainWindow.qml" line="318"/>
        <source>Dark Mode</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="98"/>
-        <location filename="qml/window/MainWindow.qml" line="106"/>
+        <location filename="qml/window/MainWindow.qml" line="94"/>
+        <location filename="qml/window/MainWindow.qml" line="102"/>
        <source>Quit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="99"/>
+        <location filename="qml/window/MainWindow.qml" line="95"/>
        <source>Are you sure you want to exit the program?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="100"/>
+        <location filename="qml/window/MainWindow.qml" line="96"/>
        <source>Minimize</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="103"/>
+        <location filename="qml/window/MainWindow.qml" line="99"/>
        <source>Friendly Reminder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="103"/>
+        <location filename="qml/window/MainWindow.qml" line="99"/>
        <source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="107"/>
-        <location filename="qml/window/MainWindow.qml" line="351"/>
+        <location filename="qml/window/MainWindow.qml" line="103"/>
+        <location filename="qml/window/MainWindow.qml" line="347"/>
        <source>Cancel</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="118"/>
+        <location filename="qml/window/MainWindow.qml" line="114"/>
        <source>Open in Separate Window</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="215"/>
+        <location filename="qml/window/MainWindow.qml" line="211"/>
        <source>Click Time</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="225"/>
+        <location filename="qml/window/MainWindow.qml" line="221"/>
        <source>Search</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="316"/>
+        <location filename="qml/window/MainWindow.qml" line="312"/>
        <source>Finish</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="317"/>
+        <location filename="qml/window/MainWindow.qml" line="313"/>
        <source>Next</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="318"/>
+        <location filename="qml/window/MainWindow.qml" line="314"/>
        <source>Previous</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="322"/>
+        <location filename="qml/window/MainWindow.qml" line="318"/>
        <source>Here you can switch to night mode.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="324"/>
+        <location filename="qml/window/MainWindow.qml" line="320"/>
        <source>Hide Easter eggs</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="324"/>
+        <location filename="qml/window/MainWindow.qml" line="320"/>
        <source>Try a few more clicks!!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="348"/>
+        <location filename="qml/window/MainWindow.qml" line="344"/>
        <source>Upgrade Tips</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="349"/>
+        <location filename="qml/window/MainWindow.qml" line="345"/>
        <source>FluentUI is currently up to date </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="349"/>
+        <location filename="qml/window/MainWindow.qml" line="345"/>
        <source> -- The current app version</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="349"/>
+        <location filename="qml/window/MainWindow.qml" line="345"/>
        <source> 
 Now go and download the new version？

@ -641,17 +641,17 @@ Updated content:
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="352"/>
+        <location filename="qml/window/MainWindow.qml" line="348"/>
        <source>OK</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="379"/>
+        <location filename="qml/window/MainWindow.qml" line="375"/>
        <source>The current version is already the latest</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="386"/>
+        <location filename="qml/window/MainWindow.qml" line="382"/>
        <source>The network is abnormal</source>
        <translation type="unfinished"></translation>
    </message>
@ -1521,46 +1521,46 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 <context>
    <name>T_MultiWindow</name>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="13"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="12"/>
        <source>MultiWindow</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="35"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="36"/>
        <source>&lt;font color=&apos;red&apos;&gt;Standard&lt;/font&gt; mode window，a new window is created every time</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="38"/>
-        <location filename="qml/page/T_MultiWindow.qml" line="62"/>
-        <location filename="qml/page/T_MultiWindow.qml" line="85"/>
-        <location filename="qml/page/T_MultiWindow.qml" line="119"/>
-        <location filename="qml/page/T_MultiWindow.qml" line="154"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="39"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="63"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="86"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="120"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="155"/>
        <source>Create Window</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="58"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="59"/>
        <source>&lt;font color=&apos;red&apos;&gt;SingleTask&lt;/font&gt; mode window，If a window exists, this activates the window</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="82"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="83"/>
        <source>&lt;font color=&apos;red&apos;&gt;SingleInstance&lt;/font&gt; mode window，If the window exists, destroy the window and create a new window</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="116"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="117"/>
        <source>Create the window without carrying any parameters</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="151"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="152"/>
        <source>Create a window with the parameter username: zhuzichu</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="160"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="161"/>
        <source>Login Window Returned Password - &gt;</source>
        <translation type="unfinished"></translation>
    </message>
@ -1735,97 +1735,97 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 <context>
    <name>T_Settings</name>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="12"/>
+        <location filename="qml/page/T_Settings.qml" line="11"/>
        <source>Settings</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="43"/>
+        <location filename="qml/page/T_Settings.qml" line="38"/>
        <source>Current Version</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="49"/>
+        <location filename="qml/page/T_Settings.qml" line="44"/>
        <source>Check for Updates</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="65"/>
+        <location filename="qml/page/T_Settings.qml" line="60"/>
        <source>Use System AppBar</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="81"/>
+        <location filename="qml/page/T_Settings.qml" line="76"/>
        <source>Fits AppBar Windows</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="92"/>
+        <location filename="qml/page/T_Settings.qml" line="87"/>
        <source>Friendly Reminder</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="93"/>
+        <location filename="qml/page/T_Settings.qml" line="88"/>
        <source>This action requires a restart of the program to take effect, is it restarted?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="95"/>
+        <location filename="qml/page/T_Settings.qml" line="90"/>
        <source>Cancel</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="96"/>
+        <location filename="qml/page/T_Settings.qml" line="91"/>
        <source>OK</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="115"/>
+        <location filename="qml/page/T_Settings.qml" line="110"/>
        <source>Dark Mode</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="120"/>
+        <location filename="qml/page/T_Settings.qml" line="115"/>
        <source>System</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="120"/>
+        <location filename="qml/page/T_Settings.qml" line="115"/>
        <source>Light</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="120"/>
+        <location filename="qml/page/T_Settings.qml" line="115"/>
        <source>Dark</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="145"/>
+        <location filename="qml/page/T_Settings.qml" line="140"/>
        <source>Navigation View Display Mode</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="150"/>
+        <location filename="qml/page/T_Settings.qml" line="145"/>
        <source>Open</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="150"/>
+        <location filename="qml/page/T_Settings.qml" line="145"/>
        <source>Compact</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="150"/>
+        <location filename="qml/page/T_Settings.qml" line="145"/>
        <source>Minimal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="150"/>
+        <location filename="qml/page/T_Settings.qml" line="145"/>
        <source>Auto</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="185"/>
+        <location filename="qml/page/T_Settings.qml" line="180"/>
        <source>Language</source>
        <translation type="unfinished"></translation>
    </message>
@ -2023,36 +2023,36 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 <context>
    <name>T_TextBox</name>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="11"/>
+        <location filename="qml/page/T_TextBox.qml" line="10"/>
        <source>TextBox</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="24"/>
+        <location filename="qml/page/T_TextBox.qml" line="19"/>
        <source>Single-line Input Box</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="43"/>
-        <location filename="qml/page/T_TextBox.qml" line="74"/>
-        <location filename="qml/page/T_TextBox.qml" line="112"/>
-        <location filename="qml/page/T_TextBox.qml" line="143"/>
-        <location filename="qml/page/T_TextBox.qml" line="172"/>
+        <location filename="qml/page/T_TextBox.qml" line="34"/>
+        <location filename="qml/page/T_TextBox.qml" line="65"/>
+        <location filename="qml/page/T_TextBox.qml" line="98"/>
+        <location filename="qml/page/T_TextBox.qml" line="129"/>
+        <location filename="qml/page/T_TextBox.qml" line="158"/>
        <source>Disabled</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="61"/>
+        <location filename="qml/page/T_TextBox.qml" line="52"/>
        <source>Please enter your password</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="94"/>
+        <location filename="qml/page/T_TextBox.qml" line="84"/>
        <source>Multi-line Input Box</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="129"/>
+        <location filename="qml/page/T_TextBox.qml" line="115"/>
        <source>AutoSuggestBox</source>
        <translation type="unfinished"></translation>
    </message>
--- a/example/example_zh_CN.ts
+++ b/example/example_zh_CN.ts
@ -535,104 +535,104 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="322"/>
+        <location filename="qml/window/MainWindow.qml" line="318"/>
        <source>Dark Mode</source>
        <translation type="unfinished">夜间模式</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="98"/>
-        <location filename="qml/window/MainWindow.qml" line="106"/>
+        <location filename="qml/window/MainWindow.qml" line="94"/>
+        <location filename="qml/window/MainWindow.qml" line="102"/>
        <source>Quit</source>
        <translation type="unfinished">退出</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="99"/>
+        <location filename="qml/window/MainWindow.qml" line="95"/>
        <source>Are you sure you want to exit the program?</source>
        <translation type="unfinished">您确定要退出程序吗</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="100"/>
+        <location filename="qml/window/MainWindow.qml" line="96"/>
        <source>Minimize</source>
        <translation type="unfinished">最小化</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="103"/>
+        <location filename="qml/window/MainWindow.qml" line="99"/>
        <source>Friendly Reminder</source>
        <translation type="unfinished">友情提示</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="103"/>
+        <location filename="qml/window/MainWindow.qml" line="99"/>
        <source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
        <translation type="unfinished">FluentUI 在托盘中处于隐藏状态，单击托盘以再次激活窗口</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="107"/>
-        <location filename="qml/window/MainWindow.qml" line="351"/>
+        <location filename="qml/window/MainWindow.qml" line="103"/>
+        <location filename="qml/window/MainWindow.qml" line="347"/>
        <source>Cancel</source>
        <translation type="unfinished">取消</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="118"/>
+        <location filename="qml/window/MainWindow.qml" line="114"/>
        <source>Open in Separate Window</source>
        <translation type="unfinished">在独立窗口中打开</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="215"/>
+        <location filename="qml/window/MainWindow.qml" line="211"/>
        <source>Click Time</source>
        <translation type="unfinished">点击次数</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="225"/>
+        <location filename="qml/window/MainWindow.qml" line="221"/>
        <source>Search</source>
        <translation type="unfinished">搜索</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="316"/>
+        <location filename="qml/window/MainWindow.qml" line="312"/>
        <source>Finish</source>
        <translation type="unfinished">完成</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="317"/>
+        <location filename="qml/window/MainWindow.qml" line="313"/>
        <source>Next</source>
        <translation type="unfinished">下一步</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="318"/>
+        <location filename="qml/window/MainWindow.qml" line="314"/>
        <source>Previous</source>
        <translation type="unfinished">上一步</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="322"/>
+        <location filename="qml/window/MainWindow.qml" line="318"/>
        <source>Here you can switch to night mode.</source>
        <translation type="unfinished">在这里，您可以切换到夜间模式。</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="324"/>
+        <location filename="qml/window/MainWindow.qml" line="320"/>
        <source>Hide Easter eggs</source>
        <translation type="unfinished">隐藏彩蛋</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="324"/>
+        <location filename="qml/window/MainWindow.qml" line="320"/>
        <source>Try a few more clicks!!</source>
        <translation type="unfinished">再试几下！！</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="348"/>
+        <location filename="qml/window/MainWindow.qml" line="344"/>
        <source>Upgrade Tips</source>
        <translation type="unfinished">升级提示</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="349"/>
+        <location filename="qml/window/MainWindow.qml" line="345"/>
        <source>FluentUI is currently up to date </source>
        <translation type="unfinished">FluentUI 目前最新版本 </translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="349"/>
+        <location filename="qml/window/MainWindow.qml" line="345"/>
        <source> -- The current app version</source>
        <translation type="unfinished"> -- 当前应用版本</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="349"/>
+        <location filename="qml/window/MainWindow.qml" line="345"/>
        <source> 
 Now go and download the new version？

@ -645,17 +645,17 @@ Updated content:
 </translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="352"/>
+        <location filename="qml/window/MainWindow.qml" line="348"/>
        <source>OK</source>
        <translation type="unfinished">确定</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="379"/>
+        <location filename="qml/window/MainWindow.qml" line="375"/>
        <source>The current version is already the latest</source>
        <translation type="unfinished">当前版本已经是最新版本</translation>
    </message>
    <message>
-        <location filename="qml/window/MainWindow.qml" line="386"/>
+        <location filename="qml/window/MainWindow.qml" line="382"/>
        <source>The network is abnormal</source>
        <translation type="unfinished">网络异常</translation>
    </message>
@ -1561,46 +1561,46 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 <context>
    <name>T_MultiWindow</name>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="13"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="12"/>
        <source>MultiWindow</source>
        <translation type="unfinished">多窗口</translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="35"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="36"/>
        <source>&lt;font color=&apos;red&apos;&gt;Standard&lt;/font&gt; mode window，a new window is created every time</source>
        <translation type="unfinished">&lt;font color=&apos;red&apos;&gt;Standard&lt;/font&gt; 模式窗口，每次都会创建新窗口</translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="38"/>
-        <location filename="qml/page/T_MultiWindow.qml" line="62"/>
-        <location filename="qml/page/T_MultiWindow.qml" line="85"/>
-        <location filename="qml/page/T_MultiWindow.qml" line="119"/>
-        <location filename="qml/page/T_MultiWindow.qml" line="154"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="39"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="63"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="86"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="120"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="155"/>
        <source>Create Window</source>
        <translation type="unfinished">创建窗口</translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="58"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="59"/>
        <source>&lt;font color=&apos;red&apos;&gt;SingleTask&lt;/font&gt; mode window，If a window exists, this activates the window</source>
        <translation type="unfinished">&lt;font color=&apos;red&apos;&gt;SingleTask&lt;/font&gt; 模式窗口，如果窗口存在，这激活该窗口</translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="82"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="83"/>
        <source>&lt;font color=&apos;red&apos;&gt;SingleInstance&lt;/font&gt; mode window，If the window exists, destroy the window and create a new window</source>
        <translation type="unfinished">&lt;font color=&apos;red&apos;&gt;SingleInstance&lt;/font&gt; 模式窗口，如果窗口存在，则销毁窗口，然后新建窗口</translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="116"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="117"/>
        <source>Create the window without carrying any parameters</source>
        <translation type="unfinished">创建一个窗口，不携带任何参数</translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="151"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="152"/>
        <source>Create a window with the parameter username: zhuzichu</source>
        <translation type="unfinished">创建一个窗口，并携带参数用户名：zhuzichu</translation>
    </message>
    <message>
-        <location filename="qml/page/T_MultiWindow.qml" line="160"/>
+        <location filename="qml/page/T_MultiWindow.qml" line="161"/>
        <source>Login Window Returned Password - &gt;</source>
        <translation type="unfinished">登录窗口返回过来的密码 - &gt;</translation>
    </message>
@ -1785,97 +1785,97 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 <context>
    <name>T_Settings</name>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="12"/>
+        <location filename="qml/page/T_Settings.qml" line="11"/>
        <source>Settings</source>
        <translation type="unfinished">设置</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="43"/>
+        <location filename="qml/page/T_Settings.qml" line="38"/>
        <source>Current Version</source>
        <translation type="unfinished">当前版本</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="49"/>
+        <location filename="qml/page/T_Settings.qml" line="44"/>
        <source>Check for Updates</source>
        <translation type="unfinished">检查更新</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="65"/>
+        <location filename="qml/page/T_Settings.qml" line="60"/>
        <source>Use System AppBar</source>
        <translation type="unfinished">使用系统应用栏</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="81"/>
+        <location filename="qml/page/T_Settings.qml" line="76"/>
        <source>Fits AppBar Windows</source>
        <translation type="unfinished">沉浸式应用栏</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="92"/>
+        <location filename="qml/page/T_Settings.qml" line="87"/>
        <source>Friendly Reminder</source>
        <translation type="unfinished">友情提示</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="93"/>
+        <location filename="qml/page/T_Settings.qml" line="88"/>
        <source>This action requires a restart of the program to take effect, is it restarted?</source>
        <translation type="unfinished">此操作需要重启程序才能生效，是否重新启动？</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="95"/>
+        <location filename="qml/page/T_Settings.qml" line="90"/>
        <source>Cancel</source>
        <translation type="unfinished">取消</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="96"/>
+        <location filename="qml/page/T_Settings.qml" line="91"/>
        <source>OK</source>
        <translation type="unfinished">确定</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="115"/>
+        <location filename="qml/page/T_Settings.qml" line="110"/>
        <source>Dark Mode</source>
        <translation type="unfinished">夜间模式</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="120"/>
+        <location filename="qml/page/T_Settings.qml" line="115"/>
        <source>System</source>
        <translation type="unfinished">跟随系统</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="120"/>
+        <location filename="qml/page/T_Settings.qml" line="115"/>
        <source>Light</source>
        <translation type="unfinished">浅色</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="120"/>
+        <location filename="qml/page/T_Settings.qml" line="115"/>
        <source>Dark</source>
        <translation type="unfinished">深色</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="145"/>
+        <location filename="qml/page/T_Settings.qml" line="140"/>
        <source>Navigation View Display Mode</source>
        <translation type="unfinished">导航视图</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="150"/>
+        <location filename="qml/page/T_Settings.qml" line="145"/>
        <source>Open</source>
        <translation type="unfinished">开放</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="150"/>
+        <location filename="qml/page/T_Settings.qml" line="145"/>
        <source>Compact</source>
        <translation type="unfinished">紧凑</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="150"/>
+        <location filename="qml/page/T_Settings.qml" line="145"/>
        <source>Minimal</source>
        <translation type="unfinished">极简</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="150"/>
+        <location filename="qml/page/T_Settings.qml" line="145"/>
        <source>Auto</source>
        <translation type="unfinished">自动</translation>
    </message>
    <message>
-        <location filename="qml/page/T_Settings.qml" line="185"/>
+        <location filename="qml/page/T_Settings.qml" line="180"/>
        <source>Language</source>
        <translation type="unfinished">语言</translation>
    </message>
@ -2093,36 +2093,36 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 <context>
    <name>T_TextBox</name>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="11"/>
+        <location filename="qml/page/T_TextBox.qml" line="10"/>
        <source>TextBox</source>
        <translation type="unfinished">文本框</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="24"/>
+        <location filename="qml/page/T_TextBox.qml" line="19"/>
        <source>Single-line Input Box</source>
        <translation type="unfinished">单行输入框</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="43"/>
-        <location filename="qml/page/T_TextBox.qml" line="74"/>
-        <location filename="qml/page/T_TextBox.qml" line="112"/>
-        <location filename="qml/page/T_TextBox.qml" line="143"/>
-        <location filename="qml/page/T_TextBox.qml" line="172"/>
+        <location filename="qml/page/T_TextBox.qml" line="34"/>
+        <location filename="qml/page/T_TextBox.qml" line="65"/>
+        <location filename="qml/page/T_TextBox.qml" line="98"/>
+        <location filename="qml/page/T_TextBox.qml" line="129"/>
+        <location filename="qml/page/T_TextBox.qml" line="158"/>
        <source>Disabled</source>
        <translation type="unfinished">禁用</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="61"/>
+        <location filename="qml/page/T_TextBox.qml" line="52"/>
        <source>Please enter your password</source>
        <translation type="unfinished">请输入您的密码</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="94"/>
+        <location filename="qml/page/T_TextBox.qml" line="84"/>
        <source>Multi-line Input Box</source>
        <translation type="unfinished">多行输入框</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TextBox.qml" line="129"/>
+        <location filename="qml/page/T_TextBox.qml" line="115"/>
        <source>AutoSuggestBox</source>
        <translation type="unfinished">自动建议框</translation>
    </message>
--- a/example/qml/App.qml
+++ b/example/qml/App.qml
@ -4,30 +4,26 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import FluentUI 1.0

-Item {
+FluLauncher {
    id: app
-
    Connections{
        target: FluTheme
        function onDarkModeChanged(){
            SettingsHelper.saveDarkMode(FluTheme.darkMode)
        }
    }
-
    Connections{
        target: FluApp
        function onUseSystemAppBarChanged(){
            SettingsHelper.saveUseSystemAppBar(FluApp.useSystemAppBar)
        }
    }
-
    Connections{
        target: TranslateHelper
        function onCurrentChanged(){
            SettingsHelper.saveLanguage(TranslateHelper.current)
        }
    }
-
    Component.onCompleted: {
        FluNetwork.openLog = false
        FluNetwork.setInterceptor(function(param){
@ -38,7 +34,7 @@ Item {
        FluApp.useSystemAppBar = SettingsHelper.getUseSystemAppBar()
        FluTheme.darkMode = SettingsHelper.getDarkMode()
        FluTheme.enableAnimation = true
-        FluApp.routes = {
+        FluRouter.routes = {
            "/":"qrc:/example/qml/window/MainWindow.qml",
            "/about":"qrc:/example/qml/window/AboutWindow.qml",
            "/login":"qrc:/example/qml/window/LoginWindow.qml",
@ -51,9 +47,9 @@ Item {
        }
        var args = Qt.application.arguments
        if(args.length>=2 && args[1].startsWith("-crashed=")){
-            FluApp.navigate("/crash",{crashFilePath:args[1].replace("-crashed=","")})
+            FluRouter.navigate("/crash",{crashFilePath:args[1].replace("-crashed=","")})
        }else{
-            FluApp.navigate("/")
+            FluRouter.navigate("/")
        }
    }
 }
--- a/example/qml/global/GlobalModel.qml
+++ b/example/qml/global/GlobalModel.qml
@ -0,0 +1,10 @@
+pragma Singleton
+
+import QtQuick 2.15
+import FluentUI 1.0
+
+QtObject{
+
+    property int displayMode: FluNavigationViewType.Auto
+
+}
--- a/example/qml/global/ItemsFooter.qml
+++ b/example/qml/global/ItemsFooter.qml
@ -16,7 +16,7 @@ FluObject{
        title:qsTr("About")
        icon:FluentIcons.Contact
        onTapListener:function(){
-            FluApp.navigate("/about")
+            FluRouter.navigate("/about")
        }
    }

--- a/example/qml/global/ItemsOriginal.qml
+++ b/example/qml/global/ItemsOriginal.qml
@ -462,7 +462,7 @@ FluObject{
        FluPaneItem{
            title: qsTr("Hot Loader")
            onTapListener: function(){
-                FluApp.navigate("/hotload")
+                FluRouter.navigate("/hotload")
            }
        }
        FluPaneItem{
--- a/example/qml/global/qmldir
+++ b/example/qml/global/qmldir
@ -1,2 +1,3 @@
-singleton ItemsOriginal 1.0 ItemsOriginal.qml
+singleton ItemsOriginal 1.0 ItemsOriginal.qml
 singleton ItemsFooter 1.0 ItemsFooter.qml
+singleton GlobalModel 1.0 GlobalModel.qml
--- a/example/qml/page/T_MultiWindow.qml
+++ b/example/qml/page/T_MultiWindow.qml
@ -8,16 +8,17 @@ import "../component"
 FluScrollablePage{

    property string password: ""
-    property var loginPageRegister: registerForWindowResult("/login")

    title: qsTr("MultiWindow")

-    Connections{
-        target: loginPageRegister
-        function onResult(data)
-        {
-            password = data.password
-        }
+    FluWindowResultLauncher{
+        id:loginResultLauncher
+        path: "/login"
+        onResult:
+            (data)=>{
+                password = data.password
+            }
+
    }

    FluArea{
@ -37,7 +38,7 @@ FluScrollablePage{
            FluButton{
                text: qsTr("Create Window")
                onClicked: {
-                    FluApp.navigate("/standardWindow")
+                    FluRouter.navigate("/standardWindow")
                }
            }
        }
@ -61,7 +62,7 @@ FluScrollablePage{
            FluButton{
                text: qsTr("Create Window")
                onClicked: {
-                    FluApp.navigate("/singleTaskWindow")
+                    FluRouter.navigate("/singleTaskWindow")
                }
            }
        }
@ -84,7 +85,7 @@ FluScrollablePage{
            FluButton{
                text: qsTr("Create Window")
                onClicked: {
-                    FluApp.navigate("/singleInstanceWindow")
+                    FluRouter.navigate("/singleInstanceWindow")
                }
            }
        }
@ -118,7 +119,7 @@ FluScrollablePage{
            FluButton{
                text: qsTr("Create Window")
                onClicked: {
-                    FluApp.navigate("/about")
+                    FluRouter.navigate("/about")
                }
            }
        }
@ -129,7 +130,7 @@ FluScrollablePage{
        code:'FluButton{
    text: qsTr("Create Window")
    onClicked: {
-        FluApp.navigate("/about")
+        FluRouter.navigate("/about")
    }
 }
 '
@ -153,7 +154,7 @@ FluScrollablePage{
            FluButton{
                text: qsTr("Create Window")
                onClicked: {
-                    loginPageRegister.launch({username:"zhuzichu"})
+                    loginResultLauncher.launch({username:"zhuzichu"})
                }
            }
            FluText{
--- a/example/qml/page/T_Settings.qml
+++ b/example/qml/page/T_Settings.qml
@ -4,17 +4,12 @@ import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
 import FluentUI 1.0
 import "../component"
-import "../viewmodel"
 import "../global"

 FluScrollablePage{

    title: qsTr("Settings")

-    SettingsViewModel{
-        id:viewmodel_settings
-    }
-
    FluEvent{
        id:event_checkupdate_finish
        name: "checkUpdateFinish"
@ -95,7 +90,7 @@ FluScrollablePage{
        negativeText: qsTr("Cancel")
        positiveText: qsTr("OK")
        onPositiveClicked: {
-            FluApp.exit(931)
+            FluRouter.exit(931)
        }
    }

@ -149,10 +144,10 @@ FluScrollablePage{
            Repeater{
                model: [{title:qsTr("Open"),mode:FluNavigationViewType.Open},{title:qsTr("Compact"),mode:FluNavigationViewType.Compact},{title:qsTr("Minimal"),mode:FluNavigationViewType.Minimal},{title:qsTr("Auto"),mode:FluNavigationViewType.Auto}]
                delegate: FluRadioButton{
-                    checked : viewmodel_settings.displayMode===modelData.mode
-                    text:modelData.title
+                    text: modelData.title
+                    checked: GlobalModel.displayMode === modelData.mode
                    clickListener:function(){
-                        viewmodel_settings.displayMode = modelData.mode
+                        GlobalModel.displayMode = modelData.mode
                    }
                }
            }
--- a/example/qml/page/T_TextBox.qml
+++ b/example/qml/page/T_TextBox.qml
@ -4,16 +4,11 @@ import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import FluentUI 1.0
 import "../component"
-import "../viewmodel"

 FluScrollablePage{

    title: qsTr("TextBox")

-    TextBoxViewModel{
-        id:viewModel
-    }
-
    FluArea{
        Layout.fillWidth: true
        height: 68
@ -24,10 +19,6 @@ FluScrollablePage{
            placeholderText: qsTr("Single-line Input Box")
            disabled: text_box_switch.checked
            cleanEnabled: true
-            text: viewModel.text1
-            onTextChanged: {
-                viewModel.text1 = text
-            }
            anchors{
                verticalCenter: parent.verticalCenter
                left: parent.left
@ -82,7 +73,6 @@ FluScrollablePage{
 }'
    }

-
    FluArea{
        Layout.fillWidth: true
        height: 36+multiine_textbox.height
@ -92,10 +82,6 @@ FluScrollablePage{
        FluMultilineTextBox{
            id: multiine_textbox
            placeholderText: qsTr("Multi-line Input Box")
-            text:viewModel.text2
-            onTextChanged: {
-                viewModel.text2 = text
-            }
            disabled: text_box_multi_switch.checked
            anchors{
                verticalCenter: parent.verticalCenter
--- a/example/qml/viewmodel/SettingsViewModel.qml
+++ b/example/qml/viewmodel/SettingsViewModel.qml
@ -1,14 +0,0 @@
-import QtQuick 2.15
-import FluentUI 1.0
-
-FluViewModel{
-
-    objectName: "SettingsViewModel"
-    scope: FluViewModelType.Application
-    property int displayMode
-
-    onInitData: {
-        displayMode = FluNavigationViewType.Auto
-    }
-
-}
--- a/example/qml/viewmodel/TextBoxViewModel.qml
+++ b/example/qml/viewmodel/TextBoxViewModel.qml
@ -1,8 +0,0 @@
-import QtQuick 2.15
-import FluentUI 1.0
-
-FluViewModel {
-    objectName: "TextBoxView"
-    property string text1
-    property string text2
-}
--- a/example/qml/window/AboutWindow.qml
+++ b/example/qml/window/AboutWindow.qml
@ -31,7 +31,7 @@ FluWindow {
                MouseArea{
                    anchors.fill: parent
                    onClicked: {
-                        FluApp.navigate("/")
+                        FluRouter.navigate("/")
                    }
                }
            }
--- a/example/qml/window/CrashWindow.qml
+++ b/example/qml/window/CrashWindow.qml
@ -71,7 +71,7 @@ FluWindow {
        FluFilledButton{
            text: qsTr("Restart Program")
            onClicked: {
-                FluApp.exit(931)
+                FluRouter.exit(931)
            }
        }
    }
--- a/example/qml/window/LoginWindow.qml
+++ b/example/qml/window/LoginWindow.qml
@ -51,7 +51,7 @@ FluWindow {
                    showError(qsTr("Please feel free to enter a password"))
                    return
                }
-                onResult({password:textbox_password.text})
+                setResult({password:textbox_password.text})
                window.close()
            }
        }
--- a/example/qml/window/MainWindow.qml
+++ b/example/qml/window/MainWindow.qml
@ -7,7 +7,6 @@ import Qt.labs.platform 1.1
 import FluentUI 1.0
 import example 1.0
 import "../component"
-import "../viewmodel"
 import "../global"

 FluWindow {
@ -29,10 +28,6 @@ FluWindow {
        z:7
    }

-    SettingsViewModel{
-        id:viewmodel_settings
-    }
-
    FluEvent{
        id:event_checkupdate
        name: "checkUpdate"
@ -60,6 +55,7 @@ FluWindow {

    Component.onDestruction: {
        FluEventBus.unRegisterEvent(event_checkupdate)
+        FluRouter.exit()
    }

    SystemTrayIcon {
@ -71,7 +67,7 @@ FluWindow {
            MenuItem {
                text: "退出"
                onTriggered: {
-                    FluApp.exit()
+                    FluRouter.exit()
                }
            }
        }
@ -106,7 +102,7 @@ FluWindow {
        positiveText: qsTr("Quit")
        neutralText: qsTr("Cancel")
        onPositiveClicked:{
-            FluApp.exit(0)
+            FluRouter.exit(0)
        }
    }

@ -118,7 +114,7 @@ FluWindow {
                text: qsTr("Open in Separate Window")
                font.pixelSize: 12
                onClicked: {
-                    FluApp.navigate("/pageWindow",{title:modelData.title,url:modelData.url})
+                    FluRouter.navigate("/pageWindow",{title:modelData.title,url:modelData.url})
                }
            }
        }
@ -197,7 +193,7 @@ FluWindow {
                z:999
                //Stack模式，每次切换都会将页面压入栈中，随着栈的页面增多，消耗的内存也越多，内存消耗多就会卡顿，这时候就需要按返回将页面pop掉，释放内存。该模式可以配合FluPage中的launchMode属性，设置页面的启动模式
                //                pageMode: FluNavigationViewType.Stack
-                //NoStack模式，每次切换都会销毁之前的页面然后创建一个新的页面，只需消耗少量内存，可以配合FluViewModel保存页面数据（推荐）
+                //NoStack模式，每次切换都会销毁之前的页面然后创建一个新的页面，只需消耗少量内存
                pageMode: FluNavigationViewType.NoStack
                items: ItemsOriginal
                footerItems:ItemsFooter
@ -207,7 +203,7 @@ FluWindow {
                    }
                    return FluTools.isMacos() ? 20 : 0
                }
-                displayMode:viewmodel_settings.displayMode
+                displayMode: GlobalModel.displayMode
                logo: "qrc:/example/res/image/favicon.ico"
                title:"FluentUI"
                onLogoClicked:{
--- a/example/res/template/src/App.qml.in
+++ b/example/res/template/src/App.qml.in
@ -12,6 +12,6 @@ Item {
        FluApp.routes = {
            "/":"qrc:/main.qml",
        }
-        FluApp.navigate("/")
+        FluRouter.navigate("/")
    }
 }