From c330dc840eda50d9ad8109a99613cef9280408d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Fri, 23 Feb 2024 12:26:10 +0800 Subject: [PATCH] update --- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows-mingw.yml | 2 +- .github/workflows/windows.yml | 2 +- example/example.qrc | 2 +- example/qml-Qt6/component/CodeExpander.qml | 2 +- example/qml-Qt6/global/ItemsOriginal.qml | 12 +++++------ .../{T_StatusView.qml => T_StatusLayout.qml} | 16 +++++++-------- example/qml-Qt6/window/HotloadWindow.qml | 4 ++-- example/qml/component/CodeExpander.qml | 2 +- example/qml/global/ItemsOriginal.qml | 12 +++++------ .../{T_StatusView.qml => T_StatusLayout.qml} | 16 +++++++-------- example/qml/window/HotloadWindow.qml | 4 ++-- src/Def.h | 4 ++-- src/FluentUI.cpp | 4 ++-- .../FluentUI/Controls/FluContentPage.qml | 4 ++-- .../FluentUI/Controls/FluRemoteLoader.qml | 8 ++++---- .../FluentUI/Controls/FluScrollablePage.qml | 4 ++-- ...{FluStatusView.qml => FluStatusLayout.qml} | 20 +++++++++---------- src/Qt5/imports/FluentUI/plugins.qmltypes | 8 ++++---- src/Qt5/imports/fluentui.qrc | 2 +- .../FluentUI/Controls/FluContentPage.qml | 4 ++-- .../FluentUI/Controls/FluRemoteLoader.qml | 8 ++++---- .../FluentUI/Controls/FluScrollablePage.qml | 4 ++-- ...{FluStatusView.qml => FluStatusLayout.qml} | 20 +++++++++---------- 25 files changed, 84 insertions(+), 84 deletions(-) rename example/qml-Qt6/page/{T_StatusView.qml => T_StatusLayout.qml} (81%) rename example/qml/page/{T_StatusView.qml => T_StatusLayout.qml} (81%) rename src/Qt5/imports/FluentUI/Controls/{FluStatusView.qml => FluStatusLayout.qml} (84%) rename src/Qt6/imports/FluentUI/Controls/{FluStatusView.qml => FluStatusLayout.qml} (84%) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f88f14e6..2f67a136 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [macos-latest] - qt_ver: [6.6.1] + qt_ver: [6.6.2] qt_arch: [clang_64] env: targetName: example diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index a044bb49..42ba9767 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - qt_ver: [6.6.1] + qt_ver: [6.6.2] qt_arch: [gcc_64] env: targetName: example diff --git a/.github/workflows/windows-mingw.yml b/.github/workflows/windows-mingw.yml index 41ea35b1..cd67f8b7 100644 --- a/.github/workflows/windows-mingw.yml +++ b/.github/workflows/windows-mingw.yml @@ -24,7 +24,7 @@ jobs: os: [windows-latest] include: - qt_arch: win64_mingw - qt_ver: 6.6.1 + qt_ver: 6.6.2 qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900" qt_tools_mingw_install: mingw900_64 env: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4b8195fc..c4d2339f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [windows-latest] include: - - qt_ver: 6.6.1 + - qt_ver: 6.6.2 qt_arch: win64_msvc2019_64 msvc_arch: x64 qt_arch_install: msvc2019_64 diff --git a/example/example.qrc b/example/example.qrc index 81b71b54..fff92ff6 100644 --- a/example/example.qrc +++ b/example/example.qrc @@ -157,7 +157,7 @@ qml/page/T_Screenshot.qml qml/page/T_Settings.qml qml/page/T_Slider.qml - qml/page/T_StatusView.qml + qml/page/T_StatusLayout.qml qml/page/T_TableView.qml qml/page/T_TabView.qml qml/page/T_Text.qml diff --git a/example/qml-Qt6/component/CodeExpander.qml b/example/qml-Qt6/component/CodeExpander.qml index de1a9d2b..2b7a7ff1 100644 --- a/example/qml-Qt6/component/CodeExpander.qml +++ b/example/qml-Qt6/component/CodeExpander.qml @@ -118,7 +118,7 @@ FluExpander{ "FluTableView", "FluColors", "FluTheme", - "FluStatusView", + "FluStatusLayout", "FluRatingControl", "FluPasswordBox", "FluBreadcrumbBar", diff --git a/example/qml-Qt6/global/ItemsOriginal.qml b/example/qml-Qt6/global/ItemsOriginal.qml index c8707d7a..43a007dc 100644 --- a/example/qml-Qt6/global/ItemsOriginal.qml +++ b/example/qml-Qt6/global/ItemsOriginal.qml @@ -192,12 +192,6 @@ FluObject{ url:"qrc:/example/qml/page/T_Clip.qml" onTap:{ navigationView.push(url) } } - FluPaneItem{ - title:"StatusView" - menuDelegate: paneItemMenu - url:"qrc:/example/qml/page/T_StatusView.qml" - onTap:{ navigationView.push(url) } - } FluPaneItem{ title:"Carousel" menuDelegate: paneItemMenu @@ -233,6 +227,12 @@ FluObject{ url:"qrc:/example/qml/page/T_SplitLayout.qml" onTap:{ navigationView.push(url) } } + FluPaneItem{ + title:"StatusLayout" + menuDelegate: paneItemMenu + url:"qrc:/example/qml/page/T_StatusLayout.qml" + onTap:{ navigationView.push(url) } + } } FluPaneItemExpander{ diff --git a/example/qml-Qt6/page/T_StatusView.qml b/example/qml-Qt6/page/T_StatusLayout.qml similarity index 81% rename from example/qml-Qt6/page/T_StatusView.qml rename to example/qml-Qt6/page/T_StatusLayout.qml index f0dbff84..1b400711 100644 --- a/example/qml-Qt6/page/T_StatusView.qml +++ b/example/qml-Qt6/page/T_StatusLayout.qml @@ -7,7 +7,7 @@ import "../component" FluScrollablePage{ - title:"StatusView" + title:"StatusLayout" FluArea{ id:layout_actions @@ -25,28 +25,28 @@ FluScrollablePage{ text:"Loading" onClicked: { btn_status_mode.text = text - status_view.statusMode = FluStatusViewType.Loading + status_view.statusMode = FluStatusLayoutType.Loading } } FluMenuItem{ text:"Empty" onClicked: { btn_status_mode.text = text - status_view.statusMode = FluStatusViewType.Empty + status_view.statusMode = FluStatusLayoutType.Empty } } FluMenuItem{ text:"Error" onClicked: { btn_status_mode.text = text - status_view.statusMode = FluStatusViewType.Error + status_view.statusMode = FluStatusLayoutType.Error } } FluMenuItem{ text:"Success" onClicked: { btn_status_mode.text = text - status_view.statusMode = FluStatusViewType.Success + status_view.statusMode = FluStatusLayoutType.Success } } } @@ -58,7 +58,7 @@ FluScrollablePage{ Layout.topMargin: 10 height: 380 paddings: 10 - FluStatusView{ + FluStatusLayout{ id:status_view anchors.fill: parent onErrorClicked:{ @@ -73,9 +73,9 @@ FluScrollablePage{ CodeExpander{ Layout.fillWidth: true Layout.topMargin: -1 - code:'FluStatusView{ + code:'FluStatusLayout{ anchors.fill: parent - statusMode: FluStatusViewType.Loading + statusMode: FluStatusLayoutType.Loading Rectangle{ anchors.fill: parent color:FluTheme.primaryColor diff --git a/example/qml-Qt6/window/HotloadWindow.qml b/example/qml-Qt6/window/HotloadWindow.qml index bd9a4116..5b1a0f2d 100644 --- a/example/qml-Qt6/window/HotloadWindow.qml +++ b/example/qml-Qt6/window/HotloadWindow.qml @@ -25,7 +25,7 @@ FluWindow { FluRemoteLoader{ id:loader anchors.fill: parent - statusMode: FluStatusViewType.Success + statusMode: FluStatusLayoutType.Success lazy: true errorItem: Item{ FluText{ @@ -43,7 +43,7 @@ FluWindow { text:"拖入qml文件" font.pixelSize: 26 anchors.centerIn: parent - visible: !loader.itemLodaer().item && loader.statusMode === FluStatusViewType.Success + visible: !loader.itemLodaer().item && loader.statusMode === FluStatusLayoutType.Success } Rectangle{ radius: 4 diff --git a/example/qml/component/CodeExpander.qml b/example/qml/component/CodeExpander.qml index dbe9deab..ca76fbcb 100644 --- a/example/qml/component/CodeExpander.qml +++ b/example/qml/component/CodeExpander.qml @@ -118,7 +118,7 @@ FluExpander{ "FluTableView", "FluColors", "FluTheme", - "FluStatusView", + "FluStatusLayout", "FluRatingControl", "FluPasswordBox", "FluBreadcrumbBar", diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml index 916402ee..0705aa66 100644 --- a/example/qml/global/ItemsOriginal.qml +++ b/example/qml/global/ItemsOriginal.qml @@ -192,12 +192,6 @@ FluObject{ url:"qrc:/example/qml/page/T_Clip.qml" onTap:{ navigationView.push(url) } } - FluPaneItem{ - title:"StatusView" - menuDelegate: paneItemMenu - url:"qrc:/example/qml/page/T_StatusView.qml" - onTap:{ navigationView.push(url) } - } FluPaneItem{ title:"Carousel" menuDelegate: paneItemMenu @@ -233,6 +227,12 @@ FluObject{ url:"qrc:/example/qml/page/T_SplitLayout.qml" onTap:{ navigationView.push(url) } } + FluPaneItem{ + title:"StatusLayout" + menuDelegate: paneItemMenu + url:"qrc:/example/qml/page/T_StatusLayout.qml" + onTap:{ navigationView.push(url) } + } } FluPaneItemExpander{ diff --git a/example/qml/page/T_StatusView.qml b/example/qml/page/T_StatusLayout.qml similarity index 81% rename from example/qml/page/T_StatusView.qml rename to example/qml/page/T_StatusLayout.qml index 0c5198c7..05280d20 100644 --- a/example/qml/page/T_StatusView.qml +++ b/example/qml/page/T_StatusLayout.qml @@ -7,7 +7,7 @@ import "../component" FluScrollablePage{ - title:"StatusView" + title:"StatusLayout" FluArea{ id:layout_actions @@ -25,28 +25,28 @@ FluScrollablePage{ text:"Loading" onClicked: { btn_status_mode.text = text - status_view.statusMode = FluStatusViewType.Loading + status_view.statusMode = FluStatusLayoutType.Loading } } FluMenuItem{ text:"Empty" onClicked: { btn_status_mode.text = text - status_view.statusMode = FluStatusViewType.Empty + status_view.statusMode = FluStatusLayoutType.Empty } } FluMenuItem{ text:"Error" onClicked: { btn_status_mode.text = text - status_view.statusMode = FluStatusViewType.Error + status_view.statusMode = FluStatusLayoutType.Error } } FluMenuItem{ text:"Success" onClicked: { btn_status_mode.text = text - status_view.statusMode = FluStatusViewType.Success + status_view.statusMode = FluStatusLayoutType.Success } } } @@ -58,7 +58,7 @@ FluScrollablePage{ Layout.topMargin: 10 height: 380 paddings: 10 - FluStatusView{ + FluStatusLayout{ id:status_view anchors.fill: parent onErrorClicked:{ @@ -73,9 +73,9 @@ FluScrollablePage{ CodeExpander{ Layout.fillWidth: true Layout.topMargin: -1 - code:'FluStatusView{ + code:'FluStatusLayout{ anchors.fill: parent - statusMode: FluStatusViewType.Loading + statusMode: FluStatusLayoutType.Loading Rectangle{ anchors.fill: parent color:FluTheme.primaryColor diff --git a/example/qml/window/HotloadWindow.qml b/example/qml/window/HotloadWindow.qml index 798dc419..19ac9184 100644 --- a/example/qml/window/HotloadWindow.qml +++ b/example/qml/window/HotloadWindow.qml @@ -25,7 +25,7 @@ FluWindow { FluRemoteLoader{ id:loader anchors.fill: parent - statusMode: FluStatusViewType.Success + statusMode: FluStatusLayoutType.Success lazy: true errorItem: Item{ FluText{ @@ -43,7 +43,7 @@ FluWindow { text:"拖入qml文件" font.pixelSize: 26 anchors.centerIn: parent - visible: !loader.itemLodaer().item && loader.statusMode === FluStatusViewType.Success + visible: !loader.itemLodaer().item && loader.statusMode === FluStatusLayoutType.Success } Rectangle{ radius: 4 diff --git a/src/Def.h b/src/Def.h index 30278035..dd7e0797 100644 --- a/src/Def.h +++ b/src/Def.h @@ -92,7 +92,7 @@ Q_ENUM_NS(SelectionMode) QML_NAMED_ELEMENT(FluTreeViewType) } -namespace FluStatusViewType { +namespace FluStatusLayoutType { Q_NAMESPACE enum StatusMode { Loading = 0x0000, @@ -101,7 +101,7 @@ enum StatusMode { Success = 0x0004 }; Q_ENUM_NS(StatusMode) -QML_NAMED_ELEMENT(FluStatusViewType) +QML_NAMED_ELEMENT(FluStatusLayoutType) } namespace FluContentDialogType { diff --git a/src/FluentUI.cpp b/src/FluentUI.cpp index ee1128c2..17baf13b 100644 --- a/src/FluentUI.cpp +++ b/src/FluentUI.cpp @@ -114,7 +114,7 @@ void FluentUI::registerTypes(const char *uri){ qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluShadow.qml"),uri,major,minor,"FluShadow"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluSlider.qml"),uri,major,minor,"FluSlider"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluSpinBox.qml"),uri,major,minor,"FluSpinBox"); - qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluStatusView.qml"),uri,major,minor,"FluStatusView"); + qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluStatusLayout.qml"),uri,major,minor,"FluStatusLayout"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluTabView.qml"),uri,major,minor,"FluTabView"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluTableView.qml"),uri,major,minor,"FluTableView"); qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluText.qml"),uri,major,minor,"FluText"); @@ -144,7 +144,7 @@ void FluentUI::registerTypes(const char *uri){ qmlRegisterUncreatableMetaObject(FluPageType::staticMetaObject, uri,major,minor,"FluPageType", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(FluWindowType::staticMetaObject, uri,major,minor,"FluWindowType", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(FluTreeViewType::staticMetaObject, uri,major,minor,"FluTreeViewType", "Access to enums & flags only"); - qmlRegisterUncreatableMetaObject(FluStatusViewType::staticMetaObject, uri,major,minor,"FluStatusViewType", "Access to enums & flags only"); + qmlRegisterUncreatableMetaObject(FluStatusLayoutType::staticMetaObject, uri,major,minor,"FluStatusLayoutType", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(FluContentDialogType::staticMetaObject, uri,major,minor,"FluContentDialogType", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(FluTimePickerType::staticMetaObject, uri,major,minor,"FluTimePickerType", "Access to enums & flags only"); qmlRegisterUncreatableMetaObject(FluCalendarViewType::staticMetaObject, uri,major,minor,"FluCalendarViewType", "Access to enums & flags only"); diff --git a/src/Qt5/imports/FluentUI/Controls/FluContentPage.qml b/src/Qt5/imports/FluentUI/Controls/FluContentPage.qml index 05f48a68..a2639d6f 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluContentPage.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluContentPage.qml @@ -37,10 +37,10 @@ FluPage { rightMargin: control.rightPadding } } - FluStatusView{ + FluStatusLayout{ id:status_view color: "#00000000" - statusMode: FluStatusViewType.Success + statusMode: FluStatusLayoutType.Success onErrorClicked: control.errorClicked() anchors{ left: parent.left diff --git a/src/Qt5/imports/FluentUI/Controls/FluRemoteLoader.qml b/src/Qt5/imports/FluentUI/Controls/FluRemoteLoader.qml index ffd725ac..b0805aa6 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluRemoteLoader.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluRemoteLoader.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import FluentUI 1.0 -FluStatusView { +FluStatusLayout { property url source: "" property bool lazy: false color:"transparent" @@ -21,11 +21,11 @@ FluStatusView { asynchronous: true onStatusChanged: { if(status === Loader.Error){ - control.statusMode = FluStatusViewType.Error + control.statusMode = FluStatusLayoutType.Error }else if(status === Loader.Loading){ - control.statusMode = FluStatusViewType.Loading + control.statusMode = FluStatusLayoutType.Loading }else{ - control.statusMode = FluStatusViewType.Success + control.statusMode = FluStatusLayoutType.Success } } } diff --git a/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml b/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml index 1f3b949c..ee7d0c67 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml @@ -38,10 +38,10 @@ FluPage { rightMargin: control.rightPadding } } - FluStatusView{ + FluStatusLayout{ id:status_view color: "#00000000" - statusMode: FluStatusViewType.Success + statusMode: FluStatusLayoutType.Success onErrorClicked: control.errorClicked() anchors{ left: parent.left diff --git a/src/Qt5/imports/FluentUI/Controls/FluStatusView.qml b/src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml similarity index 84% rename from src/Qt5/imports/FluentUI/Controls/FluStatusView.qml rename to src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml index 2dbd28de..d2c06ace 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluStatusView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml @@ -7,7 +7,7 @@ import FluentUI 1.0 Item{ id:control default property alias content: container.data - property int statusMode: FluStatusViewType.Loading + property int statusMode: FluStatusLayoutType.Loading property string loadingText:"正在加载..." property string emptyText: "空空如也" property string errorText: "页面出错了.." @@ -21,20 +21,20 @@ Item{ Item{ id:container anchors.fill: parent - visible: statusMode===FluStatusViewType.Success + visible: statusMode===FluStatusLayoutType.Success } FluLoader{ id:loader anchors.fill: parent - visible: statusMode!==FluStatusViewType.Success + visible: statusMode!==FluStatusLayoutType.Success sourceComponent: { - if(statusMode === FluStatusViewType.Loading){ + if(statusMode === FluStatusLayoutType.Loading){ return loadingItem } - if(statusMode === FluStatusViewType.Empty){ + if(statusMode === FluStatusLayoutType.Empty){ return emptyItem } - if(statusMode === FluStatusViewType.Error){ + if(statusMode === FluStatusLayoutType.Error){ return errorItem } return undefined @@ -103,15 +103,15 @@ Item{ } } function showSuccessView(){ - statusMode = FluStatusViewType.Success + statusMode = FluStatusLayoutType.Success } function showLoadingView(){ - statusMode = FluStatusViewType.Loading + statusMode = FluStatusLayoutType.Loading } function showEmptyView(){ - statusMode = FluStatusViewType.Empty + statusMode = FluStatusLayoutType.Empty } function showErrorView(){ - statusMode = FluStatusViewType.Error + statusMode = FluStatusLayoutType.Error } } diff --git a/src/Qt5/imports/FluentUI/plugins.qmltypes b/src/Qt5/imports/FluentUI/plugins.qmltypes index 2bb2293b..09c5455f 100644 --- a/src/Qt5/imports/FluentUI/plugins.qmltypes +++ b/src/Qt5/imports/FluentUI/plugins.qmltypes @@ -158,8 +158,8 @@ Module { } } Component { - name: "FluStatusViewType" - exports: ["FluentUI/FluStatusViewType 1.0"] + name: "FluStatusLayoutType" + exports: ["FluentUI/FluStatusLayoutType 1.0"] isCreatable: false exportMetaObjectRevisions: [0] Enum { @@ -3521,8 +3521,8 @@ Module { } Component { prototype: "QQuickItem" - name: "FluentUI/FluStatusView 1.0" - exports: ["FluentUI/FluStatusView 1.0"] + name: "FluentUI/FluStatusLayout 1.0" + exports: ["FluentUI/FluStatusLayout 1.0"] exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "content" diff --git a/src/Qt5/imports/fluentui.qrc b/src/Qt5/imports/fluentui.qrc index 2f336421..5e9de1f4 100644 --- a/src/Qt5/imports/fluentui.qrc +++ b/src/Qt5/imports/fluentui.qrc @@ -70,7 +70,7 @@ FluentUI/Controls/FluSlider.qml FluentUI/Controls/FluSpinBox.qml FluentUI/Controls/FluStaggeredLayout.qml - FluentUI/Controls/FluStatusView.qml + FluentUI/Controls/FluStatusLayout.qml FluentUI/Controls/FluTableView.qml FluentUI/Controls/FluTabView.qml FluentUI/Controls/FluText.qml diff --git a/src/Qt6/imports/FluentUI/Controls/FluContentPage.qml b/src/Qt6/imports/FluentUI/Controls/FluContentPage.qml index 85b687d1..02815fab 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluContentPage.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluContentPage.qml @@ -37,10 +37,10 @@ FluPage { rightMargin: control.rightPadding } } - FluStatusView{ + FluStatusLayout{ id:status_view color: "#00000000" - statusMode: FluStatusViewType.Success + statusMode: FluStatusLayoutType.Success onErrorClicked: control.errorClicked() anchors{ left: parent.left diff --git a/src/Qt6/imports/FluentUI/Controls/FluRemoteLoader.qml b/src/Qt6/imports/FluentUI/Controls/FluRemoteLoader.qml index e1f6267e..13c7142d 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluRemoteLoader.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluRemoteLoader.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import FluentUI -FluStatusView { +FluStatusLayout { property url source: "" property bool lazy: false color:"transparent" @@ -21,11 +21,11 @@ FluStatusView { asynchronous: true onStatusChanged: { if(status === Loader.Error){ - control.statusMode = FluStatusViewType.Error + control.statusMode = FluStatusLayoutType.Error }else if(status === Loader.Loading){ - control.statusMode = FluStatusViewType.Loading + control.statusMode = FluStatusLayoutType.Loading }else{ - control.statusMode = FluStatusViewType.Success + control.statusMode = FluStatusLayoutType.Success } } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluScrollablePage.qml b/src/Qt6/imports/FluentUI/Controls/FluScrollablePage.qml index d221d948..6aafc0c9 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluScrollablePage.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluScrollablePage.qml @@ -38,10 +38,10 @@ FluPage { rightMargin: control.rightPadding } } - FluStatusView{ + FluStatusLayout{ id:status_view color: "#00000000" - statusMode: FluStatusViewType.Success + statusMode: FluStatusLayoutType.Success onErrorClicked: control.errorClicked() anchors{ left: parent.left diff --git a/src/Qt6/imports/FluentUI/Controls/FluStatusView.qml b/src/Qt6/imports/FluentUI/Controls/FluStatusLayout.qml similarity index 84% rename from src/Qt6/imports/FluentUI/Controls/FluStatusView.qml rename to src/Qt6/imports/FluentUI/Controls/FluStatusLayout.qml index 9f7b9a48..ab82ba21 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluStatusView.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluStatusLayout.qml @@ -6,7 +6,7 @@ import FluentUI Item{ id:control default property alias content: container.data - property int statusMode: FluStatusViewType.Loading + property int statusMode: FluStatusLayoutType.Loading property string loadingText:"正在加载..." property string emptyText: "空空如也" property string errorText: "页面出错了.." @@ -20,20 +20,20 @@ Item{ Item{ id:container anchors.fill: parent - visible: statusMode===FluStatusViewType.Success + visible: statusMode===FluStatusLayoutType.Success } FluLoader{ id:loader anchors.fill: parent - visible: statusMode!==FluStatusViewType.Success + visible: statusMode!==FluStatusLayoutType.Success sourceComponent: { - if(statusMode === FluStatusViewType.Loading){ + if(statusMode === FluStatusLayoutType.Loading){ return loadingItem } - if(statusMode === FluStatusViewType.Empty){ + if(statusMode === FluStatusLayoutType.Empty){ return emptyItem } - if(statusMode === FluStatusViewType.Error){ + if(statusMode === FluStatusLayoutType.Error){ return errorItem } return undefined @@ -102,15 +102,15 @@ Item{ } } function showSuccessView(){ - statusMode = FluStatusViewType.Success + statusMode = FluStatusLayoutType.Success } function showLoadingView(){ - statusMode = FluStatusViewType.Loading + statusMode = FluStatusLayoutType.Loading } function showEmptyView(){ - statusMode = FluStatusViewType.Empty + statusMode = FluStatusLayoutType.Empty } function showErrorView(){ - statusMode = FluStatusViewType.Error + statusMode = FluStatusLayoutType.Error } }