From cbd4c229aa81d40b56591f6a55d4bd588ac2324c Mon Sep 17 00:00:00 2001 From: zhuzihcu Date: Thu, 30 Mar 2023 18:23:33 +0800 Subject: [PATCH] update --- src/controls/FluAutoSuggestBox.qml | 77 ++++++++++++++++++++-------- src/controls/FluMultiLineTextBox.qml | 46 +++++++++++++---- src/controls/FluTextBox.qml | 44 +++++++++++++--- 3 files changed, 129 insertions(+), 38 deletions(-) diff --git a/src/controls/FluAutoSuggestBox.qml b/src/controls/FluAutoSuggestBox.qml index b1bd0f2..6d78386 100644 --- a/src/controls/FluAutoSuggestBox.qml +++ b/src/controls/FluAutoSuggestBox.qml @@ -11,6 +11,10 @@ TextField{ property bool disabled: false signal itemClicked(var data) signal handleClicked + QtObject{ + id:d + property bool flagVisible: true + } id:input width: 300 enabled: !disabled @@ -20,13 +24,7 @@ TextField{ } return FluTheme.dark ? Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1) } - selectionColor: { - if(FluTheme.dark){ - return FluTheme.primaryColor.lighter - }else{ - return FluTheme.primaryColor.dark - } - } + selectionColor: FluTheme.primaryColor.lightest renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering placeholderTextColor: { if(disabled){ @@ -39,11 +37,9 @@ TextField{ } rightPadding: icon_right.visible ? 50 : 30 selectByMouse: true - Keys.onUpPressed: { list_view.currentIndex = Math.max(list_view.currentIndex-1,0) } - Keys.onDownPressed: { list_view.currentIndex = Math.min(list_view.currentIndex+1,list_view.count-1) } @@ -129,10 +125,8 @@ TextField{ Popup{ id:input_popup - visible: input.focus y:input.height - modal: true - dim:false + focus: false enter: Transition { NumberAnimation { property: "y" @@ -147,9 +141,6 @@ TextField{ duration: 150 } } - onClosed: { - input.focus = false - } onVisibleChanged: { if(visible){ list_view.currentIndex = -1 @@ -165,7 +156,6 @@ TextField{ height: 38*Math.min(Math.max(list_view.count,1),8) ListView{ id:list_view - signal closePopup anchors.fill: parent clip: true currentIndex: -1 @@ -207,12 +197,7 @@ TextField{ } } } - onClicked: handleClick() - function handleClick(){ - input_popup.close() - input.itemClicked(modelData) - input.text = modelData.title - } + onClicked: handleClick(modelData) } Rectangle{ width: 3 @@ -237,8 +222,56 @@ TextField{ } } + function handleClick(modelData){ + input_popup.visible = false + input.itemClicked(modelData) + d.flagVisible = false + input.text = modelData.title + d.flagVisible = true + } + onTextChanged: { searchData() + if(d.flagVisible){ + input_popup.visible = true + } + } + + TapHandler { + acceptedButtons: Qt.RightButton + onTapped: menu.popup() + } + FluMenu{ + id:menu + focus: false + FluMenuItem{ + text: "剪切" + visible: input.text !== "" + onClicked: { + input.cut() + } + } + FluMenuItem{ + text: "复制" + visible: input.selectedText !== "" + onClicked: { + input.copy() + } + } + FluMenuItem{ + text: "粘贴" + visible: input.canPaste + onClicked: { + input.paste() + } + } + FluMenuItem{ + text: "全选" + visible: input.text !== "" + onClicked: { + input.selectAll() + } + } } function searchData(){ diff --git a/src/controls/FluMultiLineTextBox.qml b/src/controls/FluMultiLineTextBox.qml index 0d83a5a..6f6e6a9 100644 --- a/src/controls/FluMultiLineTextBox.qml +++ b/src/controls/FluMultiLineTextBox.qml @@ -20,13 +20,7 @@ TextArea{ wrapMode: Text.WrapAnywhere renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering selectByMouse: true - selectionColor: { - if(FluTheme.dark){ - return FluTheme.primaryColor.lighter - }else{ - return FluTheme.primaryColor.dark - } - } + selectionColor: FluTheme.primaryColor.lightest background: FluTextBoxBackground{ inputItem: input } @@ -79,6 +73,40 @@ TextArea{ return text.pixelSize * 1.0 } } - - + TapHandler { + acceptedButtons: Qt.RightButton + onTapped: menu.popup() + } + FluMenu{ + id:menu + focus: false + FluMenuItem{ + text: "剪切" + visible: input.text !== "" + onClicked: { + input.cut() + } + } + FluMenuItem{ + text: "复制" + visible: input.selectedText !== "" + onClicked: { + input.copy() + } + } + FluMenuItem{ + text: "粘贴" + visible: input.canPaste + onClicked: { + input.paste() + } + } + FluMenuItem{ + text: "全选" + visible: input.text !== "" + onClicked: { + input.selectAll() + } + } + } } diff --git a/src/controls/FluTextBox.qml b/src/controls/FluTextBox.qml index 2cd2239..3915f67 100644 --- a/src/controls/FluTextBox.qml +++ b/src/controls/FluTextBox.qml @@ -18,13 +18,7 @@ TextField{ return FluTheme.dark ? Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1) } renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering - selectionColor: { - if(FluTheme.dark){ - return FluTheme.primaryColor.lighter - }else{ - return FluTheme.primaryColor.dark - } - } + selectionColor: FluTheme.primaryColor.lightest placeholderTextColor: { if(disabled){ return FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1) @@ -78,6 +72,42 @@ TextField{ background: FluTextBoxBackground{ inputItem: input } + TapHandler { + acceptedButtons: Qt.RightButton + onTapped: menu.popup() + } + FluMenu{ + id:menu + focus: false + FluMenuItem{ + text: "剪切" + visible: input.text !== "" + onClicked: { + input.cut() + } + } + FluMenuItem{ + text: "复制" + visible: input.selectedText !== "" + onClicked: { + input.copy() + } + } + FluMenuItem{ + text: "粘贴" + visible: input.canPaste + onClicked: { + input.paste() + } + } + FluMenuItem{ + text: "全选" + visible: input.text !== "" + onClicked: { + input.selectAll() + } + } + } }