amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-22 19:00:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-03-19 18:06:58 +08:00
parent 89c183afd5
commit ea8f25ff73
7 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example/example_en_US.ts
View File

@ -1982,17 +1982,17 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_TableView.qml" line="512"/> <location filename="qml/page/T_TableView.qml" line="513"/>
<source>Options</source> <source>Options</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_TableView.qml" line="531"/> <location filename="qml/page/T_TableView.qml" line="532"/>
<source>&lt;Previous</source> <source>&lt;Previous</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_TableView.qml" line="532"/> <location filename="qml/page/T_TableView.qml" line="533"/>
<source>Next&gt;</source> <source>Next&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

6
example/example_zh_CN.ts
View File

@ -2052,17 +2052,17 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
<translation type="unfinished">长字符串</translation> <translation type="unfinished">长字符串</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_TableView.qml" line="512"/> <location filename="qml/page/T_TableView.qml" line="513"/>
<source>Options</source> <source>Options</source>
<translation type="unfinished">操作</translation> <translation type="unfinished">操作</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_TableView.qml" line="531"/> <location filename="qml/page/T_TableView.qml" line="532"/>
<source>&lt;Previous</source> <source>&lt;Previous</source>
<translation type="unfinished">&lt;上一页</translation> <translation type="unfinished">&lt;上一页</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_TableView.qml" line="532"/> <location filename="qml/page/T_TableView.qml" line="533"/>
<source>Next&gt;</source> <source>Next&gt;</source>
<translation type="unfinished">下一页&gt;</translation> <translation type="unfinished">下一页&gt;</translation>
</message> </message>

3
example/qml/page/T_TableView.qml
View File

@ -506,7 +506,8 @@ FluContentPage{
dataIndex: 'longstring', dataIndex: 'longstring',
width:200, width:200,
minimumWidth:100, minimumWidth:100,
maximumWidth:300 maximumWidth:300,
editMultiline: true
}, },
{ {
title: qsTr("Options"), title: qsTr("Options"),

34
src/Qt5/imports/FluentUI/Controls/FluTableView.qml
View File

@ -97,27 +97,23 @@ Rectangle {
id:com_edit_multiline id:com_edit_multiline
Item{ Item{
anchors.fill: parent anchors.fill: parent
ScrollView{ Flickable{
id:item_scroll id:item_scroll
clip: true clip: true
anchors.fill: parent anchors.fill: parent
ScrollBar.vertical: FluScrollBar{ ScrollBar.vertical: multiline_text_srcoll_bar
parent: item_scroll boundsBehavior: Flickable.StopAtBounds
x: item_scroll.mirrored ? 0 : item_scroll.width - width TextArea.flickable: FluMultilineTextBox {
y: item_scroll.topPadding
height: item_scroll.availableHeight
active: item_scroll.ScrollBar.horizontal.active
}
FluMultilineTextBox {
id:text_box id:text_box
text: display text: String(display)
readOnly: true === d.columns_data[column].readOnly readOnly: true === d.columns_data[column].readOnly
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
isCtrlEnterForNewline: true
Component.onCompleted: { Component.onCompleted: {
forceActiveFocus() forceActiveFocus()
selectAll() selectAll()
} }
rightPadding: 24 rightPadding: 34
onCommit: { onCommit: {
if(!readOnly){ if(!readOnly){
editTextChaged(text_box.text) editTextChaged(text_box.text)
@ -131,6 +127,9 @@ Rectangle {
iconSize: 10 iconSize: 10
width: 20 width: 20
height: 20 height: 20
padding: 0
verticalPadding: 0
horizontalPadding: 0
visible: { visible: {
if(text_box.readOnly) if(text_box.readOnly)
return false return false
@ -139,12 +138,23 @@ Rectangle {
anchors{ anchors{
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
right: parent.right right: parent.right
rightMargin: 5 rightMargin: 15
} }
onClicked:{ onClicked:{
text_box.text = "" text_box.text = ""
} }
} }
FluScrollBar{
id:multiline_text_srcoll_bar
anchors{
right: parent.right
rightMargin: 5
top: parent.top
bottom: parent.bottom
topMargin: 3
bottomMargin: 3
}
}
} }
} }
Component{ Component{

1
src/Qt5/imports/FluentUI/Controls/FluWindowDialog.qml
View File

@ -27,6 +27,7 @@ FluWindow {
function showDialog(){ function showDialog(){
var x = transientParent.x + (transientParent.width - width)/2 var x = transientParent.x + (transientParent.width - width)/2
var y = transientParent.y + (transientParent.height - height)/2 var y = transientParent.y + (transientParent.height - height)/2
control.stayTop = Qt.binding(function(){return transientParent.stayTop})
setGeometry(x,y,width,height) setGeometry(x,y,width,height)
visible = true visible = true
} }

34
src/Qt6/imports/FluentUI/Controls/FluTableView.qml
View File

@ -98,27 +98,23 @@ Rectangle {
id:com_edit_multiline id:com_edit_multiline
Item{ Item{
anchors.fill: parent anchors.fill: parent
ScrollView{ Flickable{
id:item_scroll id:item_scroll
clip: true clip: true
anchors.fill: parent anchors.fill: parent
ScrollBar.vertical: FluScrollBar{ ScrollBar.vertical: multiline_text_srcoll_bar
parent: item_scroll boundsBehavior: Flickable.StopAtBounds
x: item_scroll.mirrored ? 0 : item_scroll.width - width TextArea.flickable: FluMultilineTextBox {
y: item_scroll.topPadding
height: item_scroll.availableHeight
active: item_scroll.ScrollBar.horizontal.active
}
FluMultilineTextBox {
id:text_box id:text_box
text: display text: String(display)
readOnly: true === d.columns_data[column].readOnly readOnly: true === d.columns_data[column].readOnly
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
isCtrlEnterForNewline: true
Component.onCompleted: { Component.onCompleted: {
forceActiveFocus() forceActiveFocus()
selectAll() selectAll()
} }
rightPadding: 24 rightPadding: 34
onCommit: { onCommit: {
if(!readOnly){ if(!readOnly){
editTextChaged(text_box.text) editTextChaged(text_box.text)
@ -132,6 +128,9 @@ Rectangle {
iconSize: 10 iconSize: 10
width: 20 width: 20
height: 20 height: 20
padding: 0
verticalPadding: 0
horizontalPadding: 0
visible: { visible: {
if(text_box.readOnly) if(text_box.readOnly)
return false return false
@ -140,12 +139,23 @@ Rectangle {
anchors{ anchors{
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
right: parent.right right: parent.right
rightMargin: 5 rightMargin: 15
} }
onClicked:{ onClicked:{
text_box.text = "" text_box.text = ""
} }
} }
FluScrollBar{
id:multiline_text_srcoll_bar
anchors{
right: parent.right
rightMargin: 5
top: parent.top
bottom: parent.bottom
topMargin: 3
bottomMargin: 3
}
}
} }
} }
Component{ Component{

2
src/Qt6/imports/FluentUI/Controls/FluWindowDialog.qml
View File

@ -10,6 +10,7 @@ FluWindow {
autoVisible: false autoVisible: false
autoCenter: false autoCenter: false
autoDestory: true autoDestory: true
stayTop: true
fixSize: true fixSize: true
Loader{ Loader{
anchors.fill: parent anchors.fill: parent
@ -27,6 +28,7 @@ FluWindow {
function showDialog(){ function showDialog(){
var x = transientParent.x + (transientParent.width - width)/2 var x = transientParent.x + (transientParent.width - width)/2
var y = transientParent.y + (transientParent.height - height)/2 var y = transientParent.y + (transientParent.height - height)/2
control.stayTop = Qt.binding(function(){return transientParent.stayTop})
setGeometry(x,y,width,height) setGeometry(x,y,width,height)
visible = true visible = true
} }