diff --git a/example/qml/page/T_Timeline.qml b/example/qml/page/T_Timeline.qml index 9d35be1d..3e7ae2b7 100644 --- a/example/qml/page/T_Timeline.qml +++ b/example/qml/page/T_Timeline.qml @@ -65,7 +65,7 @@ FluScrollablePage{ id:list_model ListElement{ lable:"2013-09-01" - text:"考上中国皮城大学,杰斯武器工坊专业" + text:'  考上中国皮城大学,杰斯武器工坊专业' } ListElement{ lable:"2017-07-01" @@ -96,7 +96,7 @@ FluScrollablePage{ text:"开发FluentUI组件库" } ListElement{ - lable:"2023-03-28(富文本展示)" + lable:"2023-03-28" text:'将FluentUI源码开源到github,并发布视频到B站' lableDelegate:()=>com_lable textDelegate:()=>com_text diff --git a/example/res/image/image_1.jpg b/example/res/image/image_1.jpg new file mode 100644 index 00000000..550846fe Binary files /dev/null and b/example/res/image/image_1.jpg differ diff --git a/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml b/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml index 8f0d9bc4..d7b2110c 100644 --- a/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml +++ b/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml @@ -17,13 +17,15 @@ FluTextBox{ id:d property bool flagVisible: true } + onActiveFocusChanged: { + if(!activeFocus){ + control_popup.visible = false + } + } Popup{ id:control_popup y:control.height focus: false -// modal: true -// Overlay.modal: Item{} - padding: 0 enter: Transition { NumberAnimation { diff --git a/src/imports/FluentUI/Controls/FluNavigationView.qml b/src/imports/FluentUI/Controls/FluNavigationView.qml index 8b30ec37..289b997a 100644 --- a/src/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/imports/FluentUI/Controls/FluNavigationView.qml @@ -98,6 +98,9 @@ Item { collapseAll() } d.enableNavigationPanel = false + if(loader_auto_suggest_box.item){ + loader_auto_suggest_box.item.focus = false + } } } Component{ @@ -122,6 +125,7 @@ Item { Component{ id:com_panel_item_header Item{ + clip: true height: { if(model.parent){ return model.parent.isExpand ? 30 : 0 @@ -151,6 +155,7 @@ Item { Item{ height: 38 width: layout_list.width + clip: true FluControl{ id:item_control anchors{ @@ -335,7 +340,12 @@ Item { right: item_title.right rightMargin: 8 } - sourceComponent: model.showEdit ? model.editDelegate : undefined + sourceComponent: { + if(d.isCompact){ + return undefined + } + return model.showEdit ? model.editDelegate : undefined + } onStatusChanged: { if(status === Loader.Ready){ item.forceActiveFocus() @@ -529,7 +539,12 @@ Item { right: item_title.right rightMargin: 8 } - sourceComponent: model.showEdit ? model.editDelegate : undefined + sourceComponent: { + if(d.isCompact){ + return undefined + } + return model.showEdit ? model.editDelegate : undefined + } onStatusChanged: { if(status === Loader.Ready){ item.forceActiveFocus() diff --git a/src/imports/FluentUI/Controls/FluTimeline.qml b/src/imports/FluentUI/Controls/FluTimeline.qml index 0d5b1ad2..01c9e017 100644 --- a/src/imports/FluentUI/Controls/FluTimeline.qml +++ b/src/imports/FluentUI/Controls/FluTimeline.qml @@ -102,6 +102,7 @@ Item{ wrapMode: Text.WrapAnywhere horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft text: modelData.text + textFormat: Text.RichText } }