Compare commits

..

No commits in common. "082fd79c5128e74eabe076d9c8bbf22daacc63bf" and "ad4d0774808f253baa3b3fc64a6ce11e51f9e439" have entirely different histories.

6 changed files with 64 additions and 83 deletions

View File

@ -24,7 +24,6 @@ FluScrollablePage{
FluTextButton{ FluTextButton{
disabled:text_button_switch.checked disabled:text_button_switch.checked
text:"Text Button" text:"Text Button"
contentDescription: "文本按钮"
onClicked: { onClicked: {
showInfo("点击Text Button") showInfo("点击Text Button")
} }

View File

@ -168,10 +168,7 @@ CustomWindow {
width: parent.width width: parent.width
height: parent.height height: parent.height
z:999 z:999
//NoStack // pageMode: FluNavigationView.NoStack
// pageMode: FluNavigationView.NoStack
//StackpopFluPagelaunchMode
pageMode: FluNavigationView.NoStack
items: ItemsOriginal items: ItemsOriginal
footerItems:ItemsFooter footerItems:ItemsFooter
topPadding:FluTools.isMacos() ? 20 : 5 topPadding:FluTools.isMacos() ? 20 : 5

View File

@ -5,6 +5,5 @@ import FluentUI
QtObject { QtObject {
readonly property string _key : FluTools.uuid() readonly property string _key : FluTools.uuid()
property int _idx property int _idx
property var _ext
property var parent property var parent
} }

View File

@ -19,41 +19,24 @@ Item{
property string errorButtonText: "重新加载" property string errorButtonText: "重新加载"
property color color: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1) property color color: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
signal errorClicked signal errorClicked
property Component loadingItem : com_loading
property Component emptyItem : com_empty
property Component errorItem : com_error
Item{ Item{
id:container id:container
anchors.fill: parent anchors.fill: parent
visible: statusMode===FluStatusView.Success visible: statusMode === FluStatusView.Success
} }
Loader{
id:loader
anchors.fill: parent
visible: statusMode!==FluStatusView.Success
sourceComponent: {
if(statusMode === FluStatusView.Loading){
return loadingItem
}
if(statusMode === FluStatusView.Empty){
return emptyItem
}
if(statusMode === FluStatusView.Error){
return errorItem
}
return null
}
}
Component{
id:com_loading
FluArea{ FluArea{
paddings: 0 paddings: 0
border.width: 0 border.width: 0
radius: 0 anchors.fill: container
visible: opacity
opacity: statusMode === FluStatusView.Loading
Behavior on opacity {
NumberAnimation { duration: 83 }
}
color:control.color color:control.color
ColumnLayout{ ColumnLayout{
anchors.centerIn: parent anchors.centerIn: parent
visible: statusMode === FluStatusView.Loading
FluProgressRing{ FluProgressRing{
indeterminate: true indeterminate: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
@ -64,16 +47,19 @@ Item{
} }
} }
} }
}
Component {
id:com_empty
FluArea{ FluArea{
paddings: 0 paddings: 0
border.width: 0 border.width: 0
radius: 0 anchors.fill: container
visible: opacity
color:control.color color:control.color
opacity: statusMode === FluStatusView.Empty
Behavior on opacity {
NumberAnimation { duration: 83 }
}
ColumnLayout{ ColumnLayout{
anchors.centerIn: parent anchors.centerIn: parent
visible: statusMode === FluStatusView.Empty
FluText{ FluText{
text:control.emptyText text:control.emptyText
font: FluTextStyle.BodyStrong font: FluTextStyle.BodyStrong
@ -81,14 +67,16 @@ Item{
} }
} }
} }
}
Component{
id:com_error
FluArea{ FluArea{
paddings: 0 paddings: 0
border.width: 0 border.width: 0
radius: 0 anchors.fill: container
visible: opacity
color:control.color color:control.color
opacity: statusMode === FluStatusView.Error
Behavior on opacity {
NumberAnimation { duration: 83 }
}
ColumnLayout{ ColumnLayout{
anchors.centerIn: parent anchors.centerIn: parent
FluText{ FluText{
@ -106,7 +94,6 @@ Item{
} }
} }
} }
}
function showSuccessView(){ function showSuccessView(){
statusMode = FluStatusView.Success statusMode = FluStatusView.Success
} }

View File

@ -83,7 +83,6 @@ TextField{
right: parent.right right: parent.right
rightMargin: closeRightMargin rightMargin: closeRightMargin
} }
contentDescription:"清空"
onClicked:{ onClicked:{
control.text = "" control.text = ""
} }