CMakeLists.txt

@@ -13,7 +13,6 @@ if(NOT FLUENTUI_QML_PLUGIN_DIRECTORY)
 endif()
 
 add_subdirectory(src)
-add_subdirectory(zxing-cpp)
 
 if (FLUENTUI_BUILD_EXAMPLES)
     add_subdirectory(example)
@@ -29,6 +28,8 @@ if (FLUENTUI_BUILD_FRAMELESSHEPLER)
     add_subdirectory(framelesshelper)
 endif ()
 
+add_subdirectory(zxing-cpp)
+
 message("------------------------ FluentUI ------------------------")
 message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}")
 message("Build FramelessHelper.: ${FLUENTUI_BUILD_FRAMELESSHEPLER}")

example/CMakeLists.txt

@@ -27,7 +27,7 @@ endif()
 file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
 
 #设置版本号
-add_definitions(-DVERSION=1,5,0,0)
+add_definitions(-DVERSION=1,4,0,0)
 
 find_package(Qt6 REQUIRED COMPONENTS Quick Svg Network)
 

example/qml/page/T_Http.qml

@@ -102,7 +102,7 @@ FluContentPage{
                     param.custname = "朱子楚"
                     param.custtel = "1234567890"
                     param.custemail = "zhuzichu520@gmail.com"
-//                    http.postJson("https://httpbingo.org/post",callable,param)
+                    http.postJson("https://httpbingo.org/post",callable,param)
                 }
             }
             FluButton{
@@ -125,7 +125,7 @@ FluContentPage{
                         console.debug(status+";"+errorString)
                     }
                     var param = "我命由我不由天"
-//                    http.postString("https://httpbingo.org/post",callable,param)
+                    http.postString("https://httpbingo.org/post",callable,param)
                 }
             }
             FluButton{

example/qml/page/T_QRCode.qml

@@ -57,7 +57,7 @@ FluScrollablePage{
         FluSlider{
             id:slider_size
             from:60
-            to:260
+            to:200
             value: 120
         }
     }

src/CMakeLists.txt

@@ -12,7 +12,7 @@ if(APPLE)
 endif()
 
 #设置版本号
-add_definitions(-DVERSION=1,5,0,0)
+add_definitions(-DVERSION=1,4,0,0)
 
 find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml)
 

src/FluHttp.cpp

@@ -32,8 +32,8 @@ void FluHttp::handleReply(QNetworkReply* reply){
     _cache.append(reply);
 }
 
-void FluHttp::post(QString url,QJSValue callable,QMap<QString, QVariant> params,QMap<QString, QVariant> headers){
+void FluHttp::post(QString url,QJSValue callable,QVariantMap params,QVariantMap headers){
-    QMap<QString, QVariant> data = invokeIntercept(params,headers,"post").toMap();
+    QVariantMap data = invokeIntercept(params,headers,"post").toMap();
     QThreadPool::globalInstance()->start([=](){
         onStart(callable);
         for (int i = 0; i < retry(); ++i) {
@@ -82,8 +82,8 @@ void FluHttp::post(QString url,QJSValue callable,QMap<QString, QVariant> params,
     });
 }
 
-void FluHttp::postString(QString url,QJSValue callable,QString params,QMap<QString, QVariant> headers){
+void FluHttp::postString(QString url,QJSValue callable,QString params,QVariantMap headers){
-    QMap<QString, QVariant> data = invokeIntercept(params,headers,"postString").toMap();
+    QVariantMap data = invokeIntercept(params,headers,"postString").toMap();
     QThreadPool::globalInstance()->start([=](){
         onStart(callable);
         for (int i = 0; i < retry(); ++i) {
@@ -121,8 +121,8 @@ void FluHttp::postString(QString url,QJSValue callable,QString params,QMap<QStri
     });
 }
 
-void FluHttp::postJson(QString url,QJSValue callable,QMap<QString, QVariant> params,QMap<QString, QVariant> headers){
+void FluHttp::postJson(QString url,QJSValue callable,QVariantMap params,QVariantMap headers){
-    QMap<QString, QVariant> data = invokeIntercept(params,headers,"postJson").toMap();
+    QVariantMap data = invokeIntercept(params,headers,"postJson").toMap();
     QThreadPool::globalInstance()->start([=](){
         onStart(callable);
         for (int i = 0; i < retry(); ++i) {
@@ -160,8 +160,8 @@ void FluHttp::postJson(QString url,QJSValue callable,QMap<QString, QVariant> par
     });
 }
 
-void FluHttp::get(QString url,QJSValue callable,QMap<QString, QVariant> params,QMap<QString, QVariant> headers){
+void FluHttp::get(QString url,QJSValue callable,QVariantMap params,QVariantMap headers){
-    QMap<QString, QVariant> data = invokeIntercept(params,headers,"get").toMap();
+    QVariantMap data = invokeIntercept(params,headers,"get").toMap();
     QThreadPool::globalInstance()->start([=](){
         for (int i = 0; i < retry(); ++i) {
             onStart(callable);
@@ -198,8 +198,8 @@ void FluHttp::get(QString url,QJSValue callable,QMap<QString, QVariant> params,Q
     });
 }
 
-void FluHttp::download(QString url,QJSValue callable,QString filePath,QMap<QString, QVariant> params,QMap<QString, QVariant> headers){
+void FluHttp::download(QString url,QJSValue callable,QString filePath,QVariantMap params,QVariantMap headers){
-    QMap<QString, QVariant> data = invokeIntercept(params,headers,"download").toMap();
+    QVariantMap data = invokeIntercept(params,headers,"download").toMap();
     QThreadPool::globalInstance()->start([=](){
         onStart(callable);
         QNetworkAccessManager manager;
@@ -239,7 +239,7 @@ void FluHttp::download(QString url,QJSValue callable,QString filePath,QMap<QStri
 }
 
 QVariant FluHttp::invokeIntercept(const QVariant& params,const QVariant& headers,const QString& method){
-    QMap<QString, QVariant> requet = {
+    QVariantMap requet = {
         {"params",params},
         {"headers",headers},
         {"method",method}

src/FluHttp.h

@@ -26,12 +26,11 @@ private:
 public:
     explicit FluHttp(QObject *parent = nullptr);
     ~FluHttp();
-    //神坑！！！ 如果参数使用QVariantMap会有问题，在6.4.3版本中QML一调用就会编译失败。所以改用QMap<QString, QVariant>
+    Q_INVOKABLE void get(QString url,QJSValue callable,QVariantMap params = {},QVariantMap headers = {});
-    Q_INVOKABLE void get(QString url,QJSValue callable,QMap<QString, QVariant> = {},QMap<QString, QVariant> headers = {});
+    Q_INVOKABLE void post(QString url,QJSValue callable,QVariantMap params = {},QVariantMap headers = {});
-    Q_INVOKABLE void post(QString url,QJSValue callable,QMap<QString, QVariant> = {},QMap<QString, QVariant> headers = {});
+    Q_INVOKABLE void postString(QString url,QJSValue callable,QString params = "",QVariantMap headers = {});
-    Q_INVOKABLE void postString(QString url,QJSValue callable,QString params = "",QMap<QString, QVariant> headers = {});
+    Q_INVOKABLE void postJson(QString url,QJSValue callable,QVariantMap params = {},QVariantMap headers = {});
-    Q_INVOKABLE void postJson(QString url,QJSValue callable,QMap<QString, QVariant> params = {},QMap<QString, QVariant> headers = {});
+    Q_INVOKABLE void download(QString url,QJSValue callable,QString filePath,QVariantMap params = {},QVariantMap headers = {});
-    Q_INVOKABLE void download(QString url,QJSValue callable,QString filePath,QMap<QString, QVariant> params = {},QMap<QString, QVariant> headers = {});
     Q_INVOKABLE void cancel();
 private:
     QList<QPointer<QNetworkReply>> _cache;

src/imports/FluentUI/Controls/FluTour.qml

@@ -67,8 +67,7 @@ Popup{
         id:canvas
         anchors.fill: parent
         onPaint: {
-            d.pos = d.target.mapToGlobal(0,0)
+            d.pos = d.target.mapToItem(control,0,0)
-            d.pos = Qt.point(d.pos.x-d.window.x,d.pos.y-d.window.y)
             var ctx = canvas.getContext("2d")
             ctx.clearRect(0, 0, canvasSize.width, canvasSize.height)
             ctx.save()
@@ -95,6 +94,7 @@ Popup{
             ctx.closePath()
         }
     }
+
     FluArea{
         id:layout_panne
         radius: 5
@@ -160,8 +160,8 @@ Popup{
                 top: parent.top
                 margins: 10
             }
-            width: 26
+            width: 20
-            height: 26
+            height: 20
             iconSize: 12
             iconSource : FluentIcons.ChromeClose
             onClicked: {

src/imports/FluentUI/qmldir

@@ -1,10 +1,11 @@
-module FluentUI
+module FluentUI
 classname FluentUIPlugin
+designersupported
 typeinfo plugins.qmltypes
 
-FluAcrylic 1.0 Controls/FluAcrylic.qml
 FluAppBar 1.0 Controls/FluAppBar.qml
 FluArea 1.0 Controls/FluArea.qml
+FluAcrylic 1.0 Controls/FluAcrylic.qml
 FluAutoSuggestBox 1.0 Controls/FluAutoSuggestBox.qml
 FluBadge 1.0 Controls/FluBadge.qml
 FluBreadcrumbBar 1.0 Controls/FluBreadcrumbBar.qml
@@ -16,9 +17,9 @@ FluCheckBox 1.0 Controls/FluCheckBox.qml
 FluColorPicker 1.0 Controls/FluColorPicker.qml
 FluColorView 1.0 Controls/FluColorView.qml
 FluComboBox 1.0 Controls/FluComboBox.qml
+FluControl 1.0 Controls/FluControl.qml
 FluContentDialog 1.0 Controls/FluContentDialog.qml
 FluContentPage 1.0 Controls/FluContentPage.qml
-FluControl 1.0 Controls/FluControl.qml
 FluCopyableText 1.0 Controls/FluCopyableText.qml
 FluDatePicker 1.0 Controls/FluDatePicker.qml
 FluDivider 1.0 Controls/FluDivider.qml
@@ -29,15 +30,15 @@ FluFlipView 1.0 Controls/FluFlipView.qml
 FluFocusRectangle 1.0 Controls/FluFocusRectangle.qml
 FluIcon 1.0 Controls/FluIcon.qml
 FluIconButton 1.0 Controls/FluIconButton.qml
-FluImage 1.0 Controls/FluImage.qml
 FluInfoBar 1.0 Controls/FluInfoBar.qml
 FluItem 1.0 Controls/FluItem.qml
-FluItemDelegate 1.0 Controls/FluItemDelegate.qml
+FluImage 1.0 Controls/FluImage.qml
+FluMediaPlayer 1.0 Controls/FluMediaPlayer.qml
 FluMenu 1.0 Controls/FluMenu.qml
-FluMenuBar 1.0 Controls/FluMenuBar.qml
-FluMenuBarItem 1.0 Controls/FluMenuBarItem.qml
 FluMenuItem 1.0 Controls/FluMenuItem.qml
 FluMenuSeparator 1.0 Controls/FluMenuSeparator.qml
+FluMenuBar 1.0 Controls/FluMenuBar.qml
+FluMenuBarItem 1.0 Controls/FluMenuBarItem.qml
 FluMultilineTextBox 1.0 Controls/FluMultilineTextBox.qml
 FluNavigationView 1.0 Controls/FluNavigationView.qml
 FluObject 1.0 Controls/FluObject.qml
@@ -59,16 +60,14 @@ FluRadioButtons 1.0 Controls/FluRadioButtons.qml
 FluRatingControl 1.0 Controls/FluRatingControl.qml
 FluRectangle 1.0 Controls/FluRectangle.qml
 FluRemoteLoader 1.0 Controls/FluRemoteLoader.qml
-FluScrollBar 1.0 Controls/FluScrollBar.qml
-FluScrollIndicator 1.0 Controls/FluScrollIndicator.qml
 FluScrollablePage 1.0 Controls/FluScrollablePage.qml
+FluScrollBar 1.0 Controls/FluScrollBar.qml
 FluShadow 1.0 Controls/FluShadow.qml
 FluSlider 1.0 Controls/FluSlider.qml
 FluSpinBox 1.0 Controls/FluSpinBox.qml
 FluStatusView 1.0 Controls/FluStatusView.qml
-FluTabView 1.0 Controls/FluTabView.qml
-FluTableModelColumn 1.0 Controls/FluTableModelColumn.qml
 FluTableView 1.0 Controls/FluTableView.qml
+FluTabView 1.0 Controls/FluTabView.qml
 FluText 1.0 Controls/FluText.qml
 FluTextBox 1.0 Controls/FluTextBox.qml
 FluTextBoxBackground 1.0 Controls/FluTextBoxBackground.qml
@@ -78,7 +77,7 @@ FluTimePicker 1.0 Controls/FluTimePicker.qml
 FluToggleButton 1.0 Controls/FluToggleButton.qml
 FluToggleSwitch 1.0 Controls/FluToggleSwitch.qml
 FluTooltip 1.0 Controls/FluTooltip.qml
-FluTour 1.0 Controls/FluTour.qml
 FluTreeView 1.0 Controls/FluTreeView.qml
 FluWindow 1.0 Controls/FluWindow.qml
+FluSingleton 1.0 Controls/FluSingleton.qml
 plugin fluentuiplugin