update

src/CMakeLists.txt

@@ -73,11 +73,15 @@ if(QT_VERSION VERSION_GREATER_EQUAL "6.2")
     endif()
 
     #遍历所有qml文件
-    file(GLOB_RECURSE QML_PATHS *.qml)
+    file(GLOB_RECURSE QML_PATHS *.qml qmldir)
     foreach(filepath ${QML_PATHS})
         if(${filepath} MATCHES "Qt${QT_VERSION_MAJOR}/")
             string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
-            list(APPEND qml_files ${filename})
+            if(${filename} MATCHES "qmldir")
+                list(APPEND resource_files ${filename})
+            else()
+                list(APPEND qml_files ${filename})
+            endif()
         endif()
     endforeach(filepath)
 

src/Def.h

@@ -4,16 +4,6 @@
 #include <QObject>
 #include <QtQml/qqml.h>
 
-namespace FluViewModelType {
-Q_NAMESPACE
-enum Scope {
-    Window = 0x0000,
-    Application = 0x0001
-};
-Q_ENUM_NS(Scope)
-QML_NAMED_ELEMENT(FluViewModelType)
-}
-
 namespace FluNetworkType {
 Q_NAMESPACE
 enum CacheMode {

src/FluApp.cpp

@@ -10,20 +10,6 @@
 #include <QClipboard>
 #include <QTranslator>
 
-FluWindowRegister::FluWindowRegister(QObject *parent):QObject{parent}{
-    from(nullptr);
-    to(nullptr);
-    path("");
-}
-
-void FluWindowRegister::launch(const QJsonObject& argument){
-    FluApp::getInstance()->navigate(path(),argument,this);
-}
-
-void FluWindowRegister::onResult(const QJsonObject& data){
-    Q_EMIT result(data);
-}
-
 FluApp::FluApp(QObject *parent):QObject{parent}{
     useSystemAppBar(false);
 }
@@ -45,76 +31,3 @@ void FluApp::init(QObject *target,QLocale locale){
         }
     }
 }
-
-void FluApp::run(){
-    navigate(initialRoute());
-}
-
-void FluApp::navigate(const QString& route,const QJsonObject& argument,FluWindowRegister* windowRegister){
-    if(!routes().contains(route)){
-        qCritical()<<"Not Found Route "<<route;
-        return;
-    }
-    QQmlComponent component(_engine, routes().value(route).toString());
-    if (component.isError()) {
-        qCritical() << component.errors();
-        return;
-    }
-    QVariantMap properties;
-    properties.insert("_route",route);
-    if(windowRegister){
-        properties.insert("_windowRegister",QVariant::fromValue(windowRegister));
-    }
-    properties.insert("argument",argument);
-    QQuickWindow *win=nullptr;
-    for (const auto& pair : _windows.toStdMap()) {
-        QString r =  pair.second->property("_route").toString();
-        if(r == route){
-            win = pair.second;
-            break;
-        }
-    }
-    if(win){
-        int launchMode = win->property("launchMode").toInt();
-        if(launchMode == 1){
-            win->setProperty("",argument);
-            win->show();
-            win->raise();
-            win->requestActivate();
-            return;
-        }else if(launchMode == 2){
-            win->close();
-        }
-    }
-    win = qobject_cast<QQuickWindow*>(component.createWithInitialProperties(properties));
-    if(windowRegister){
-        windowRegister->to(win);
-    }
-}
-
-void FluApp::exit(int retCode){
-    for (const auto& pair : _windows.toStdMap()) {
-        pair.second->close();
-        removeWindow(pair.second);
-    }
-    qApp->exit(retCode);
-}
-
-void FluApp::addWindow(QQuickWindow* window){
-    _windows.insert(window->winId(),window);
-}
-
-void FluApp::removeWindow(QQuickWindow* window){
-    if(window){
-        _windows.remove(window->winId());
-        window->deleteLater();
-        window = nullptr;
-    }
-}
-
-QVariant FluApp::createWindowRegister(QQuickWindow* window,const QString& path){
-    FluWindowRegister *p = new FluWindowRegister(window);
-    p->from(window);
-    p->path(path);
-    return  QVariant::fromValue(p);
-}

src/FluApp.h

@@ -4,7 +4,6 @@
 #include <QObject>
 #include <QWindow>
 #include <QtQml/qqml.h>
-#include <QJsonArray>
 #include <QQmlContext>
 #include <QJsonObject>
 #include <QQmlEngine>
@@ -13,31 +12,12 @@
 #include "stdafx.h"
 #include "singleton.h"
 
-
-/**
- * @brief The FluWindowRegister class
- */
-class FluWindowRegister : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY_AUTO(QQuickWindow*,from)
-    Q_PROPERTY_AUTO(QQuickWindow*,to)
-    Q_PROPERTY_AUTO(QString,path);
-public:
-    explicit FluWindowRegister(QObject *parent = nullptr);
-    Q_INVOKABLE void launch(const QJsonObject& argument  = {});
-    Q_INVOKABLE void onResult(const QJsonObject& data  = {});
-    Q_SIGNAL void result(const QJsonObject& data);
-};
-
 /**
  * @brief The FluApp class
  */
 class FluApp : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY_AUTO(QString,initialRoute);
-    Q_PROPERTY_AUTO(QJsonObject,routes);
     Q_PROPERTY_AUTO(bool,useSystemAppBar);
     Q_PROPERTY_AUTO(QString,windowIcon);
     Q_PROPERTY_AUTO(QLocale,locale);
@@ -49,15 +29,8 @@ private:
 public:
     SINGLETON(FluApp)
     static FluApp *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine){return getInstance();}
-    Q_INVOKABLE void run();
-    Q_INVOKABLE void navigate(const QString& route,const QJsonObject& argument  = {},FluWindowRegister* windowRegister = nullptr);
     Q_INVOKABLE void init(QObject *target,QLocale locale = QLocale::system());
-    Q_INVOKABLE void exit(int retCode = 0);
-    Q_INVOKABLE QVariant createWindowRegister(QQuickWindow* window,const QString& path);
-    void addWindow(QQuickWindow* window);
-    void removeWindow(QQuickWindow* window);
 private:
-    QMap<quint64, QQuickWindow*> _windows;
     QQmlEngine *_engine;
     QTranslator* _translator = nullptr;
 };

src/FluTools.cpp

@@ -86,9 +86,9 @@ void FluTools::restoreOverrideCursor(){
     qApp->restoreOverrideCursor();
 }
 
-void FluTools::deleteItem(QObject *p){
+void FluTools::deleteLater(QObject *p){
     if(p){
-        delete p;
+        p->deleteLater();
         p = nullptr;
     }
 }

src/FluTools.h

@@ -34,7 +34,7 @@ public:
     Q_INVOKABLE void restoreOverrideCursor();
     Q_INVOKABLE QString html2PlantText(const QString& html);
     Q_INVOKABLE QString toLocalPath(const QUrl& url);
-    Q_INVOKABLE void deleteItem(QObject *p);
+    Q_INVOKABLE void deleteLater(QObject *p);
     Q_INVOKABLE QString getFileNameByUrl(const QUrl& url);
     Q_INVOKABLE QRect getVirtualGeometry();
     Q_INVOKABLE QString getApplicationDirPath();

src/FluViewModel.cpp

@@ -1,113 +0,0 @@
-#include "FluViewModel.h"
-
-#include <QQuickItem>
-#include "Def.h"
-
-FluViewModelManager::FluViewModelManager(QObject *parent): QObject{parent}{
-}
-
-void FluViewModelManager::insertViewModel(FluViewModel* value){
-    _viewmodel.append(value);
-}
-
-void FluViewModelManager::deleteViewModel(FluViewModel* value){
-    _viewmodel.removeOne(value);
-}
-
-QObject* FluViewModelManager::getModel(const QString& key){
-    return  _data.value(key);
-}
-
-void FluViewModelManager::insert(const QString& key,QObject* value){
-    _data.insert(key,value);
-}
-
-bool FluViewModelManager::exist(const QString& key){
-    return _data.contains(key);
-}
-
-void FluViewModelManager::refreshViewModel(FluViewModel* viewModel,QString key,QVariant value){
-    foreach (auto item, _viewmodel) {
-        if(item->getKey() == viewModel->getKey()){
-            item->enablePropertyChange = false;
-            item->setProperty(key.toLatin1().constData(),value);
-            item->enablePropertyChange  = true;
-        }
-    }
-}
-
-FluPropertyObserver::FluPropertyObserver(QString name,QObject* model,QObject *parent):QObject{parent}{
-    _name = name;
-    _model = model;
-    _property = QQmlProperty(parent,_name);
-    _property.connectNotifySignal(this,SLOT(_propertyChange()));
-}
-
-FluPropertyObserver::~FluPropertyObserver(){
-}
-
-void FluPropertyObserver::_propertyChange(){
-    auto viewModel = (FluViewModel*)parent();
-    if(viewModel->enablePropertyChange){
-        auto value = _property.read();
-        _model->setProperty(_name.toLatin1().constData(),value);
-        FluViewModelManager::getInstance()->refreshViewModel(viewModel,_name,value);
-    }
-}
-
-FluViewModel::FluViewModel(QObject *parent):QObject{parent}{
-    scope(FluViewModelType::Scope::Window);
-    FluViewModelManager::getInstance()->insertViewModel(this);
-}
-
-FluViewModel::~FluViewModel(){
-    FluViewModelManager::getInstance()->deleteViewModel(this);
-}
-
-void FluViewModel::classBegin(){
-}
-
-void FluViewModel::componentComplete(){
-    auto o = parent();
-    while (nullptr != o) {
-        _window = o;
-        o = o->parent();
-    }
-    const QMetaObject* obj = metaObject();
-    if(_scope == FluViewModelType::Scope::Window){
-        _key = property("objectName").toString()+"-"+QString::number(reinterpret_cast<qulonglong>(_window), 16);
-    }else{
-        _key = property("objectName").toString();
-    }
-    QObject * model;
-    if(!FluViewModelManager::getInstance()->exist(_key)){
-        if(_scope == FluViewModelType::Scope::Window){
-            model = new QObject(_window);
-        }else{
-            model = new QObject();
-        }
-        Q_EMIT initData();
-        for (int i = 0; i < obj->propertyCount(); ++i) {
-            const QMetaProperty property = obj->property(i);
-            QString propertyName = property.name();
-            auto value = property.read(this);
-            model->setProperty(propertyName.toLatin1().constData(),value);
-            new FluPropertyObserver(propertyName,model,this);
-        }
-        FluViewModelManager::getInstance()->insert(_key,model);
-    }else{
-        model = FluViewModelManager::getInstance()->getModel(_key);
-        for (int i = 0; i < obj->propertyCount(); ++i) {
-            const QMetaProperty property = obj->property(i);
-            QString propertyName = property.name();
-            new FluPropertyObserver(propertyName,model,this);
-        }
-    }
-    foreach (auto key, model->dynamicPropertyNames()) {
-        setProperty(key,model->property(key));
-    }
-}
-
-QString FluViewModel::getKey(){
-    return _key;
-}

src/FluViewModel.h

@@ -1,69 +0,0 @@
-#ifndef FLUVIEWMODEL_H
-#define FLUVIEWMODEL_H
-
-#include <QQuickItem>
-#include <QtQml/qqml.h>
-#include <QQuickWindow>
-#include <QQmlProperty>
-#include "stdafx.h"
-#include "singleton.h"
-
-/**
- * @brief The FluViewModel class
- */
-class FluViewModel : public QObject, public QQmlParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QQmlParserStatus)
-    Q_PROPERTY_AUTO(int,scope);
-    QML_NAMED_ELEMENT(FluViewModel)
-public:
-    explicit FluViewModel(QObject *parent = nullptr);
-    ~FluViewModel();
-    void classBegin() override;
-    void componentComplete() override;
-    Q_SIGNAL void initData();
-    QString getKey();
-    bool enablePropertyChange = true;
-private:
-    QObject* _window = nullptr;
-    QString _key = "";
-};
-
-/**
- * @brief The FluPropertyObserver class
- */
-class FluPropertyObserver: public QObject{
-    Q_OBJECT
-public:
-    explicit FluPropertyObserver(QString name,QObject* model,QObject *parent = nullptr);
-    ~FluPropertyObserver();
-private:
-    Q_SLOT void _propertyChange();
-private:
-    QString _name = "";
-    QQmlProperty _property;
-    QObject* _model = nullptr;
-};
-
-/**
- * @brief The FluViewModelManager class
- */
-class FluViewModelManager:public QObject{
-    Q_OBJECT
-private:
-    explicit FluViewModelManager(QObject *parent = nullptr);
-public:
-    SINGLETON(FluViewModelManager)
-    bool exist(const QString& key);
-    void insert(const QString& key,QObject* value);
-    QObject* getModel(const QString& key);
-    void insertViewModel(FluViewModel* value);
-    void deleteViewModel(FluViewModel* value);
-    void refreshViewModel(FluViewModel* viewModel,QString key,QVariant value);
-private:
-    QMap<QString,QObject*> _data;
-    QList<FluViewModel*> _viewmodel;
-};
-
-#endif // FLUVIEWMODEL_H

src/FluWindowLifecycle.cpp

@@ -1,28 +0,0 @@
-#include "FluWindowLifecycle.h"
-
-#include "FluApp.h"
-
-FluWindowLifecycle::FluWindowLifecycle(QObject *parent):QObject{parent}{
-
-}
-
-void FluWindowLifecycle::onCompleted(QQuickWindow* window){
-    _window = window;
-    if(_window && _window->transientParent() == nullptr){
-        FluApp::getInstance()->addWindow(_window);
-    }
-}
-
-void FluWindowLifecycle::onDestroyOnClose(){
-    if(_window && _window->transientParent() == nullptr){
-        FluApp::getInstance()->removeWindow(_window);
-        _window = nullptr;
-    }
-}
-
-void FluWindowLifecycle::onDestruction(){
-
-}
-
-void FluWindowLifecycle::onVisible(bool visible){
-}

src/FluWindowLifecycle.h

@@ -1,28 +0,0 @@
-#ifndef FLUWINDOWLIFECYCLE_H
-#define FLUWINDOWLIFECYCLE_H
-
-#include <QObject>
-#include <QQuickWindow>
-#include <QtQml/qqml.h>
-#include <QQuickItem>
-#include <QWindow>
-#include <QJsonObject>
-
-/**
- * @brief The FluWindowLifecycle class
- */
-class FluWindowLifecycle : public QObject
-{
-    Q_OBJECT
-    QML_NAMED_ELEMENT(FluWindowLifecycle)
-public:
-    explicit FluWindowLifecycle(QObject *parent = nullptr);
-    Q_INVOKABLE void onCompleted(QQuickWindow* window);
-    Q_INVOKABLE void onDestruction();
-    Q_INVOKABLE void onVisible(bool visible);
-    Q_INVOKABLE void onDestroyOnClose();
-private:
-    QQuickWindow* _window = nullptr;
-};
-
-#endif // FLUWINDOWLIFECYCLE_H

src/FluentUI.cpp

@@ -1,7 +1,6 @@
 #include "FluentUI.h"
 
 #include <QGuiApplication>
-#include "FluWindowLifecycle.h"
 #include "Def.h"
 #include "FluApp.h"
 #include "FluColors.h"
@@ -12,7 +11,6 @@
 #include "FluCaptcha.h"
 #include "FluEventBus.h"
 #include "FluTreeModel.h"
-#include "FluViewModel.h"
 #include "FluRectangle.h"
 #include "FluNetwork.h"
 #include "FluFramelessHelper.h"
@@ -27,13 +25,11 @@ void FluentUI::registerTypes(QQmlEngine *engine){
 void FluentUI::registerTypes(const char *uri){
 #if (QT_VERSION < QT_VERSION_CHECK(6, 2, 0))
     Q_INIT_RESOURCE(fluentui);
-    qmlRegisterType<FluWindowLifecycle>(uri,major,minor,"FluWindowLifecycle");
     qmlRegisterType<FluQrCodeItem>(uri,major,minor,"FluQrCodeItem");
     qmlRegisterType<FluCaptcha>(uri,major,minor,"FluCaptcha");
     qmlRegisterType<FluWatermark>(uri,major,minor,"FluWatermark");
     qmlRegisterType<FluAccentColor>(uri,major,minor,"FluAccentColor");
     qmlRegisterType<FluEvent>(uri,major,minor,"FluEvent");
-    qmlRegisterType<FluViewModel>(uri,major,minor,"FluViewModel");
     qmlRegisterType<FluTreeModel>(uri,major,minor,"FluTreeModel");
     qmlRegisterType<FluRectangle>(uri,major,minor,"FluRectangle");
     qmlRegisterType<FluNetworkCallable>(uri,major,minor,"FluNetworkCallable");
@@ -128,6 +124,9 @@ void FluentUI::registerTypes(const char *uri){
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluLoader.qml"),uri,major,minor,"FluLoader");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluShortcutPicker.qml"),uri,major,minor,"FluShortcutPicker");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluSplitLayout.qml"),uri,major,minor,"FluSplitLayout");
+    qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluWindowResultLauncher.qml"),uri,major,minor,"FluWindowResultLauncher");
+    qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluLauncher.qml"),uri,major,minor,"FluLauncher");
+    qmlRegisterSingletonType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluRouter.qml"),uri,major,minor,"FluRouter");
 
     qmlRegisterUncreatableMetaObject(Fluent_Awesome::staticMetaObject,  uri,major,minor,"FluentIcons", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluThemeType::staticMetaObject,  uri,major,minor,"FluThemeType", "Access to enums & flags only");
@@ -141,7 +140,6 @@ void FluentUI::registerTypes(const char *uri){
     qmlRegisterUncreatableMetaObject(FluTabViewType::staticMetaObject,  uri,major,minor,"FluTabViewType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluNavigationViewType::staticMetaObject,  uri,major,minor,"FluNavigationViewType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluTimelineType::staticMetaObject,  uri,major,minor,"FluTimelineType", "Access to enums & flags only");
-    qmlRegisterUncreatableMetaObject(FluViewModelType::staticMetaObject,  uri,major,minor,"FluViewModelType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluNetworkType::staticMetaObject,  uri,major,minor,"FluNetworkType", "Access to enums & flags only");
 
     qmlRegisterModule(uri,major,minor);
@@ -154,18 +152,11 @@ void FluentUI::initializeEngine(QQmlEngine *engine, const char *uri){
     font.setFamily("微软雅黑");
     QGuiApplication::setFont(font);
 #endif
-    FluApp* app = FluApp::getInstance();
-    engine->rootContext()->setContextProperty("FluApp",app);
-    FluColors* colors = FluColors::getInstance();
-    engine->rootContext()->setContextProperty("FluColors",colors);
-    FluTheme* theme = FluTheme::getInstance();
-    engine->rootContext()->setContextProperty("FluTheme",theme);
-    FluTools* tools = FluTools::getInstance();
-    engine->rootContext()->setContextProperty("FluTools",tools);
-    FluTextStyle* textStyle = FluTextStyle::getInstance();
-    engine->rootContext()->setContextProperty("FluTextStyle",textStyle);
-    FluEventBus* eventBus = FluEventBus::getInstance();
-    engine->rootContext()->setContextProperty("FluEventBus",eventBus);
-    FluNetwork* network = FluNetwork::getInstance();
-    engine->rootContext()->setContextProperty("FluNetwork",network);
+    engine->rootContext()->setContextProperty("FluApp",FluApp::getInstance());
+    engine->rootContext()->setContextProperty("FluColors",FluColors::getInstance());
+    engine->rootContext()->setContextProperty("FluTheme",FluTheme::getInstance());
+    engine->rootContext()->setContextProperty("FluTools",FluTools::getInstance());
+    engine->rootContext()->setContextProperty("FluTextStyle",FluTextStyle::getInstance());
+    engine->rootContext()->setContextProperty("FluEventBus",FluEventBus::getInstance());
+    engine->rootContext()->setContextProperty("FluNetwork",FluNetwork::getInstance());
 }

src/Qt5/imports/FluentUI/Controls/FluLauncher.qml

@@ -0,0 +1,6 @@
+import QtQuick 2.15
+import FluentUI 1.0
+import "."
+
+FluObject {
+}

src/Qt5/imports/FluentUI/Controls/FluRouter.qml

@@ -0,0 +1,71 @@
+pragma Singleton
+
+import QtQuick 2.15
+
+QtObject {
+    property var routes : ({})
+    property var windows: []
+    function addWindow(window){
+        if(!window.transientParent){
+            windows.push(window)
+        }
+    }
+    function removeWindow(window) {
+        if(!window.transientParent){
+            var index = windows.indexOf(window)
+            if (index !== -1) {
+                windows.splice(index, 1)
+                FluTools.deleteLater(window)
+            }
+        }
+    }
+    function exit(retCode){
+        for(var i =0 ;i< windows.length; i++){
+            var item = windows[i]
+            FluTools.deleteLater(item)
+        }
+        windows = []
+        Qt.exit(retCode)
+    }
+    function navigate(route,argument={},windowRegister = undefined){
+        if(!routes.hasOwnProperty(route)){
+            console.error("Not Found Route",route)
+            return
+        }
+        var windowComponent = Qt.createComponent(routes[route])
+        if (windowComponent.status !== Component.Ready) {
+            console.error(windowComponent.errorString())
+            return
+        }
+        var properties = {}
+        properties._route = route
+        if(windowRegister){
+            properties._windowRegister = windowRegister
+        }
+        properties.argument = argument
+        var win = undefined
+        for(var i =0 ;i< windows.length; i++){
+            var item = windows[i]
+            if(route === item._route){
+                win = item
+                break
+            }
+        }
+        if(win){
+            var launchMode = win.launchMode
+            if(launchMode === 1){
+                win.argument = argument
+                win.show()
+                win.raise()
+                win.requestActivate()
+                return
+            }else if(launchMode === 2){
+                win.close()
+            }
+        }
+        win  = windowComponent.createObject(null,properties)
+        if(windowRegister){
+            windowRegister._to = win
+        }
+    }
+}

src/Qt5/imports/FluentUI/Controls/FluWindow.qml

@@ -50,7 +50,7 @@ Window {
     property int resizeBorderWidth: 1
     property var closeListener: function(event){
         if(autoDestroy){
-            destroyOnClose()
+            FluRouter.removeWindow(window)
         }else{
             window.visibility = Window.Hidden
             event.accepted = false
@@ -67,6 +67,7 @@ Window {
     id:window
     color:"transparent"
     Component.onCompleted: {
+        FluRouter.addWindow(window)
         _realHeight = height
         _realWidth = width
         useSystemAppBar = FluApp.useSystemAppBar
@@ -74,7 +75,6 @@ Window {
             moveWindowToDesktopCenter()
         }
         fixWindowSize()
-        lifecycle.onCompleted(window)
         initArgument(argument)
         if(!useSystemAppBar){
             loader_frameless_helper.sourceComponent = com_frameless_helper
@@ -87,9 +87,6 @@ Window {
             }
         }
     }
-    Component.onDestruction: {
-        lifecycle.onDestruction()
-    }
     onShowSystemMenu: {
         if(loader_frameless_helper.item){
             loader_frameless_helper.item.showSystemMenu()
@@ -100,7 +97,6 @@ Window {
             window.firstVisible()
             d.isFirstVisible = false
         }
-        lifecycle.onVisible(visible)
     }
     QtObject{
         id:d
@@ -244,9 +240,6 @@ Window {
         id:info_bar
         root: window
     }
-    FluWindowLifecycle{
-        id:lifecycle
-    }
     FluLoader{
         id:loader_border
         anchors.fill: parent
@@ -263,9 +256,6 @@ Window {
             return com_border
         }
     }
-    function destroyOnClose(){
-        lifecycle.onDestroyOnClose()
-    }
     function showLoading(text = qsTr("Loading..."),cancel = true){
         loader_loading.loadingText = text
         loader_loading.cancel = cancel
@@ -302,9 +292,9 @@ Window {
     function registerForWindowResult(path){
         return FluApp.createWindowRegister(window,path)
     }
-    function onResult(data){
+    function setResult(data){
         if(_windowRegister){
-            _windowRegister.onResult(data)
+            _windowRegister.setResult(data)
         }
     }
     function showMaximized(){

src/Qt5/imports/FluentUI/Controls/FluWindowResultLauncher.qml

@@ -0,0 +1,21 @@
+import QtQuick 2.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+
+Item {
+
+    id:control
+    property var _from : Window.window
+    property var _to
+    property var path
+    signal result(var data)
+
+    function launch(argument = {}){
+        FluRouter.navigate(control.path,argument,control)
+    }
+
+    function setResult(data = {}){
+        control.result(data)
+    }
+
+}

src/Qt5/imports/FluentUI/Controls/qmldir

@@ -0,0 +1 @@
+singleton FluRouter 1.0 FluRouter.qml

src/Qt5/imports/FluentUI/qmldir

@@ -90,5 +90,7 @@ FluTour 1.0 Controls/FluTour.qml
 FluTreeView 1.0 Controls/FluTreeView.qml
 FluWindow 1.0 Controls/FluWindow.qml
 FluWindowDialog 1.0 Controls/FluWindowDialog.qml
+FluWindowResultLauncher 1.0 Controls/FluWindowResultLauncher.qml
+FluLauncher 1.0 Controls/FluLauncher.qml
 
 plugin fluentuiplugin

src/Qt5/imports/fluentui.qrc

@@ -101,5 +101,10 @@
         <file>FluentUI/Controls/FluWindowDialog.qml</file>
         <file>FluentUI/i18n/fluentui_en_US.qm</file>
         <file>FluentUI/i18n/fluentui_zh_CN.qm</file>
+        <file>FluentUI/Controls/FluLauncher.qml</file>
+        <file>FluentUI/Controls/FluRouter.qml</file>
+        <file>FluentUI/Controls/FluWindowResultLauncher.qml</file>
+        <file>FluentUI/JS/Global.js</file>
+        <file>FluentUI/Controls/qmldir</file>
     </qresource>
 </RCC>

src/Qt6/imports/FluentUI/Controls/FluLauncher.qml

@@ -0,0 +1,7 @@
+import QtQuick
+import FluentUI
+import "."
+
+FluObject {
+
+}

src/Qt6/imports/FluentUI/Controls/FluRouter.qml

@@ -0,0 +1,72 @@
+pragma Singleton
+
+import QtQuick
+import FluentUI
+
+QtObject {
+    property var routes : ({})
+    property var windows: []
+    function addWindow(window){
+        if(!window.transientParent){
+            windows.push(window)
+        }
+    }
+    function removeWindow(window) {
+        if(!window.transientParent){
+            var index = windows.indexOf(window)
+            if (index !== -1) {
+                windows.splice(index, 1)
+                FluTools.deleteLater(window)
+            }
+        }
+    }
+    function exit(retCode){
+        for(var i =0 ;i< windows.length; i++){
+            var item = windows[i]
+            FluTools.deleteLater(item)
+        }
+        windows = []
+        Qt.exit(retCode)
+    }
+    function navigate(route,argument={},windowRegister = undefined){
+        if(!routes.hasOwnProperty(route)){
+            console.error("Not Found Route",route)
+            return
+        }
+        var windowComponent = Qt.createComponent(routes[route])
+        if (windowComponent.status !== Component.Ready) {
+            console.error(windowComponent.errorString())
+            return
+        }
+        var properties = {}
+        properties._route = route
+        if(windowRegister){
+            properties._windowRegister = windowRegister
+        }
+        properties.argument = argument
+        var win = undefined
+        for(var i =0 ;i< windows.length; i++){
+            var item = windows[i]
+            if(route === item._route){
+                win = item
+                break
+            }
+        }
+        if(win){
+            var launchMode = win.launchMode
+            if(launchMode === 1){
+                win.argument = argument
+                win.show()
+                win.raise()
+                win.requestActivate()
+                return
+            }else if(launchMode === 2){
+                win.close()
+            }
+        }
+        win  = windowComponent.createObject(null,properties)
+        if(windowRegister){
+            windowRegister._to = win
+        }
+    }
+}

src/Qt6/imports/FluentUI/Controls/FluWindow.qml

@@ -49,7 +49,7 @@ Window {
     property int resizeBorderWidth: 1
     property var closeListener: function(event){
         if(autoDestroy){
-            destroyOnClose()
+            FluRouter.removeWindow(window)
         }else{
             window.visibility = Window.Hidden
             event.accepted = false
@@ -66,6 +66,7 @@ Window {
     id:window
     color:"transparent"
     Component.onCompleted: {
+        FluRouter.addWindow(window)
         _realHeight = height
         _realWidth = width
         useSystemAppBar = FluApp.useSystemAppBar
@@ -73,7 +74,6 @@ Window {
             moveWindowToDesktopCenter()
         }
         fixWindowSize()
-        lifecycle.onCompleted(window)
         initArgument(argument)
         if(!useSystemAppBar){
             loader_frameless_helper.sourceComponent = com_frameless_helper
@@ -86,9 +86,6 @@ Window {
             }
         }
     }
-    Component.onDestruction: {
-        lifecycle.onDestruction()
-    }
     onShowSystemMenu: {
         if(loader_frameless_helper.item){
             loader_frameless_helper.item.showSystemMenu()
@@ -99,7 +96,6 @@ Window {
             window.firstVisible()
             d.isFirstVisible = false
         }
-        lifecycle.onVisible(visible)
     }
     QtObject{
         id:d
@@ -243,9 +239,6 @@ Window {
         id:info_bar
         root: window
     }
-    FluWindowLifecycle{
-        id:lifecycle
-    }
     FluLoader{
         id:loader_border
         anchors.fill: parent
@@ -262,9 +255,6 @@ Window {
             return com_border
         }
     }
-    function destroyOnClose(){
-        lifecycle.onDestroyOnClose()
-    }
     function showLoading(text = qsTr("Loading..."),cancel = true){
         loader_loading.loadingText = text
         loader_loading.cancel = cancel
@@ -301,9 +291,9 @@ Window {
     function registerForWindowResult(path){
         return FluApp.createWindowRegister(window,path)
     }
-    function onResult(data){
+    function setResult(data){
         if(_windowRegister){
-            _windowRegister.onResult(data)
+            _windowRegister.setResult(data)
         }
     }
     function showMaximized(){

src/Qt6/imports/FluentUI/Controls/FluWindowResultLauncher.qml

@@ -0,0 +1,20 @@
+import QtQuick
+import FluentUI
+
+Item {
+
+    id:control
+    property var _from : Window.window
+    property var _to
+    property var path
+    signal result(var data)
+
+    function launch(argument = {}){
+        FluRouter.navigate(control.path,argument,control)
+    }
+
+    function setResult(data = {}){
+        control.result(data)
+    }
+
+}

src/Qt6/imports/FluentUI/Controls/qmldir

@@ -0,0 +1 @@
+singleton FluRouter FluRouter.qml