amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-04-25 20:39:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhuzichu 2023-10-17 14:30:43 +08:00
parent 9b5167d92e
commit 0eacc177d0
4 changed files with 354 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,10 +42,10 @@ Rectangle {
var cellPosition = cellItem.mapToItem(scroll_table, 0, 0) var cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
item_loader.column = column item_loader.column = column
item_loader.row = row item_loader.row = row
item_loader.x = table_view.contentX + cellPosition.x item_loader_layout.x = table_view.contentX + cellPosition.x
item_loader.y = table_view.contentY + cellPosition.y item_loader_layout.y = table_view.contentY + cellPosition.y
item_loader.width = table_view.columnWidthProvider(column) item_loader_layout.width = table_view.columnWidthProvider(column)
item_loader.height = table_view.rowHeightProvider(row) item_loader_layout.height = table_view.rowHeightProvider(row)
item_loader.display = display item_loader.display = display
var obj =columnSource[column].editDelegate var obj =columnSource[column].editDelegate
if(obj){ if(obj){
@ -165,82 +165,37 @@ Rectangle {
} }
} }
} }
ScrollView{
MouseArea{
id:scroll_table id:scroll_table
hoverEnabled: true
anchors.left: header_vertical.right anchors.left: header_vertical.right
anchors.top: header_horizontal.bottom anchors.top: header_horizontal.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff onExited: {
ScrollBar.vertical.policy: ScrollBar.AlwaysOff d.rowHoverIndex = -1
TableView { }
id:table_view onCanceled: {
ListModel{ d.rowHoverIndex = -1
id:model_columns }
} ScrollView{
boundsBehavior: Flickable.StopAtBounds anchors.fill: parent
ScrollBar.horizontal: FluScrollBar{ ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
id:scroll_bar_h ScrollBar.vertical.policy: ScrollBar.AlwaysOff
} TableView {
ScrollBar.vertical: FluScrollBar{ id:table_view
id:scroll_bar_v ListModel{
} id:model_columns
columnWidthProvider: function(column) {
var w = columnSource[column].width
if(!w){
w = columnSource[column].minimumWidth
} }
if(!w){ boundsBehavior: Flickable.StopAtBounds
w = d.defaultItemWidth ScrollBar.horizontal: FluScrollBar{
id:scroll_bar_h
} }
if(column === item_loader.column){ ScrollBar.vertical: FluScrollBar{
item_loader.width = w id:scroll_bar_v
} }
if(column === item_loader.column-1){ columnWidthProvider: function(column) {
let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
if(cellItem){
let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
item_loader.x = table_view.contentX + cellPosition.x
}
}
return w
}
rowHeightProvider: function(row) {
if(row>=table_model.rowCount){
return 0
}
var h = table_model.getRow(row).height
if(!h){
h = table_model.getRow(row).minimumHeight
}
if(!h){
return d.defaultItemHeight
}
if(row === item_loader.row){
item_loader.height = h
}
if(row === item_loader.row-1){
let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
if(cellItem){
let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
item_loader.y = table_view.contentY + cellPosition.y
}
}
return h
}
model: table_model
clip: true
delegate: Rectangle {
id:item_table
property point position: Qt.point(column,row)
color:{
if(d.rowHoverIndex === row || d.currentRow === table_model.getRow(row).__index){
return FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06)
}
return (row%2!==0) ? control.color : (FluTheme.dark ? Qt.rgba(1,1,1,0.015) : Qt.rgba(0,0,0,0.015))
}
implicitHeight: 40
implicitWidth: {
var w = columnSource[column].width var w = columnSource[column].width
if(!w){ if(!w){
w = columnSource[column].minimumWidth w = columnSource[column].minimumWidth
@ -248,111 +203,157 @@ Rectangle {
if(!w){ if(!w){
w = d.defaultItemWidth w = d.defaultItemWidth
} }
if(column === item_loader.column){
item_loader.width = w
}
if(column === item_loader.column-1){
let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
if(cellItem){
let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
item_loader.x = table_view.contentX + cellPosition.x
}
}
return w return w
} }
Rectangle{ rowHeightProvider: function(row) {
anchors.fill: parent if(row>=table_model.rowCount){
visible: !item_loader.sourceComponent return 0
color: "#00000000" }
var h = table_model.getRow(row).height
if(!h){
h = table_model.getRow(row).minimumHeight
}
if(!h){
return d.defaultItemHeight
}
if(row === item_loader.row){
item_loader.height = h
}
if(row === item_loader.row-1){
let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
if(cellItem){
let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
item_loader.y = table_view.contentY + cellPosition.y
}
}
return h
} }
Rectangle{ model: table_model
height: 18 clip: true
radius: 1.5 delegate: Rectangle {
color: FluTheme.primaryColor.dark id:item_table
width: 3 property point position: Qt.point(column,row)
visible: d.currentRow === table_model.getRow(row).__index && column === 0 color:{
anchors{ if(d.rowHoverIndex === row || d.currentRow === table_model.getRow(row).__index){
verticalCenter: parent.verticalCenter return FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06)
left: parent.left }
leftMargin: 3 return (row%2!==0) ? control.color : (FluTheme.dark ? Qt.rgba(1,1,1,0.015) : Qt.rgba(0,0,0,0.015))
}
implicitHeight: 40
implicitWidth: {
var w = columnSource[column].width
if(!w){
w = columnSource[column].minimumWidth
}
if(!w){
w = d.defaultItemWidth
}
return w
}
Rectangle{
height: 18
radius: 1.5
color: FluTheme.primaryColor.dark
width: 3
visible: d.currentRow === table_model.getRow(row).__index && column === 0
anchors{
verticalCenter: parent.verticalCenter
left: parent.left
leftMargin: 3
}
}
MouseArea{
anchors.fill: parent
acceptedButtons: Qt.LeftButton
onPressed:{
closeEditor()
}
onCanceled: {
}
onReleased: {
}
onDoubleClicked:{
if(typeof(display) == "object"){
return
}
item_loader.sourceComponent = d.obtEditDelegate(column,row,item_table)
}
onClicked:
(event)=>{
d.currentRow = table_model.getRow(row).__index
item_loader.sourceComponent = undefined
event.accepted = true
}
}
Loader{
property var itemModel: model
property var modelData: display
property var tableView: table_view
property var tableModel: table_model
property var position: item_table.position
property int row: position.y
property int column: position.x
property var options: {
if(typeof(modelData) == "object"){
return modelData.options
}
return {}
}
anchors.fill: parent
sourceComponent: {
if(typeof(modelData) == "object"){
return modelData.comId
}
return com_text
}
}
MouseArea{
acceptedButtons: Qt.NoButton
anchors.fill: parent
hoverEnabled: true
z:99
onPositionChanged: {
d.rowHoverIndex = row
}
onEntered: {
d.rowHoverIndex = row
}
} }
} }
MouseArea{ }
anchors.fill: parent MouseArea{
acceptedButtons: Qt.LeftButton id:item_loader_layout
onPressed:{ acceptedButtons: Qt.NoButton
closeEditor() visible: item_loader.sourceComponent
} hoverEnabled: true
onCanceled: { z:2
} onEntered: {
onReleased: { d.rowHoverIndex = -1
}
onDoubleClicked:{
if(typeof(display) == "object"){
return
}
item_loader.sourceComponent = d.obtEditDelegate(column,row,item_table)
}
onClicked:
(event)=>{
d.currentRow = table_model.getRow(row).__index
item_loader.sourceComponent = undefined
event.accepted = true
}
} }
Loader{ Loader{
property var itemModel: model id:item_loader
property var modelData: display property var display
property var tableView: table_view property int column
property var tableModel: table_model property int row
property var position: item_table.position property var tableView: control
property int row: position.y sourceComponent: undefined
property int column: position.x
property var options: {
if(typeof(modelData) == "object"){
return modelData.options
}
return {}
}
anchors.fill: parent anchors.fill: parent
sourceComponent: { onDisplayChanged: {
if(typeof(modelData) == "object"){ var obj = table_model.getRow(row)
return modelData.comId obj[columnSource[column].dataIndex] = display
} table_model.setRow(row,obj)
return com_text
} }
} }
MouseArea{
acceptedButtons: Qt.NoButton
anchors.fill: parent
hoverEnabled: true
z:99
onContainsMouseChanged: {
if(containsMouse){
d.rowHoverIndex = row
}else{
d.rowHoverIndex = -1
}
}
}
}
}
Loader{
id:item_loader
z:2
property var display
property int column
property int row
property var tableView: control
sourceComponent: undefined
onDisplayChanged: {
var obj = table_model.getRow(row)
obj[columnSource[column].dataIndex] = display
table_model.setRow(row,obj)
}
}
MouseArea{
acceptedButtons: Qt.NoButton
anchors.fill: item_loader
enabled: item_loader.sourceComponent
hoverEnabled: true
z:10
onContainsMouseChanged: {
if(containsMouse){
d.rowHoverIndex = item_loader.row
}else{
d.rowHoverIndex = -1
}
} }
} }
} }
@ -360,7 +361,6 @@ Rectangle {
id:com_handle id:com_handle
Item {} Item {}
} }
Component{ Component{
id:com_column_text id:com_column_text
FluText { FluText {

10
src/Qt5/imports/FluentUI/Controls/FluTextBox.qml
View File

@ -37,7 +37,15 @@ TextField{
return placeholderNormalColor return placeholderNormalColor
} }
selectByMouse: true selectByMouse: true
rightPadding: icon_end.visible ? 66 : 40 rightPadding: {
var w = 30
if(control.cleanEnabled === false){
w = 0
}
if(control.readOnly)
w = 0
return icon_end.visible ? w+36 : w+10
}
background: FluTextBoxBackground{ background: FluTextBoxBackground{
inputItem: control inputItem: control
implicitWidth: 240 implicitWidth: 240

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

@ -43,10 +43,10 @@ Rectangle {
var cellPosition = cellItem.mapToItem(scroll_table, 0, 0) var cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
item_loader.column = column item_loader.column = column
item_loader.row = row item_loader.row = row
item_loader.x = table_view.contentX + cellPosition.x item_loader_layout.x = table_view.contentX + cellPosition.x
item_loader.y = table_view.contentY + cellPosition.y item_loader_layout.y = table_view.contentY + cellPosition.y
item_loader.width = table_view.columnWidthProvider(column) item_loader_layout.width = table_view.columnWidthProvider(column)
item_loader.height = table_view.rowHeightProvider(row) item_loader_layout.height = table_view.rowHeightProvider(row)
item_loader.display = display item_loader.display = display
var obj =columnSource[column].editDelegate var obj =columnSource[column].editDelegate
if(obj){ if(obj){
@ -166,82 +166,37 @@ Rectangle {
} }
} }
} }
ScrollView{
MouseArea{
id:scroll_table id:scroll_table
hoverEnabled: true
anchors.left: header_vertical.right anchors.left: header_vertical.right
anchors.top: header_horizontal.bottom anchors.top: header_horizontal.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff onExited: {
ScrollBar.vertical.policy: ScrollBar.AlwaysOff d.rowHoverIndex = -1
TableView { }
id:table_view onCanceled: {
ListModel{ d.rowHoverIndex = -1
id:model_columns }
} ScrollView{
boundsBehavior: Flickable.StopAtBounds anchors.fill: parent
ScrollBar.horizontal: FluScrollBar{ ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
id:scroll_bar_h ScrollBar.vertical.policy: ScrollBar.AlwaysOff
} TableView {
ScrollBar.vertical: FluScrollBar{ id:table_view
id:scroll_bar_v ListModel{
} id:model_columns
columnWidthProvider: function(column) {
var w = columnSource[column].width
if(!w){
w = columnSource[column].minimumWidth
} }
if(!w){ boundsBehavior: Flickable.StopAtBounds
w = d.defaultItemWidth ScrollBar.horizontal: FluScrollBar{
id:scroll_bar_h
} }
if(column === item_loader.column){ ScrollBar.vertical: FluScrollBar{
item_loader.width = w id:scroll_bar_v
} }
if(column === item_loader.column-1){ columnWidthProvider: function(column) {
let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
if(cellItem){
let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
item_loader.x = table_view.contentX + cellPosition.x
}
}
return w
}
rowHeightProvider: function(row) {
if(row>=table_model.rowCount){
return 0
}
var h = table_model.getRow(row).height
if(!h){
h = table_model.getRow(row).minimumHeight
}
if(!h){
return d.defaultItemHeight
}
if(row === item_loader.row){
item_loader.height = h
}
if(row === item_loader.row-1){
let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
if(cellItem){
let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
item_loader.y = table_view.contentY + cellPosition.y
}
}
return h
}
model: table_model
clip: true
delegate: Rectangle {
id:item_table
property point position: Qt.point(column,row)
color:{
if(d.rowHoverIndex === row || d.currentRow === table_model.getRow(row).__index){
return FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06)
}
return (row%2!==0) ? control.color : (FluTheme.dark ? Qt.rgba(1,1,1,0.015) : Qt.rgba(0,0,0,0.015))
}
implicitHeight: 40
implicitWidth: {
var w = columnSource[column].width var w = columnSource[column].width
if(!w){ if(!w){
w = columnSource[column].minimumWidth w = columnSource[column].minimumWidth
@ -249,111 +204,157 @@ Rectangle {
if(!w){ if(!w){
w = d.defaultItemWidth w = d.defaultItemWidth
} }
if(column === item_loader.column){
item_loader.width = w
}
if(column === item_loader.column-1){
let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
if(cellItem){
let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
item_loader.x = table_view.contentX + cellPosition.x
}
}
return w return w
} }
Rectangle{ rowHeightProvider: function(row) {
anchors.fill: parent if(row>=table_model.rowCount){
visible: !item_loader.sourceComponent return 0
color: "#00000000" }
var h = table_model.getRow(row).height
if(!h){
h = table_model.getRow(row).minimumHeight
}
if(!h){
return d.defaultItemHeight
}
if(row === item_loader.row){
item_loader.height = h
}
if(row === item_loader.row-1){
let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
if(cellItem){
let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
item_loader.y = table_view.contentY + cellPosition.y
}
}
return h
} }
Rectangle{ model: table_model
height: 18 clip: true
radius: 1.5 delegate: Rectangle {
color: FluTheme.primaryColor.dark id:item_table
width: 3 property point position: Qt.point(column,row)
visible: d.currentRow === table_model.getRow(row).__index && column === 0 color:{
anchors{ if(d.rowHoverIndex === row || d.currentRow === table_model.getRow(row).__index){
verticalCenter: parent.verticalCenter return FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06)
left: parent.left }
leftMargin: 3 return (row%2!==0) ? control.color : (FluTheme.dark ? Qt.rgba(1,1,1,0.015) : Qt.rgba(0,0,0,0.015))
}
implicitHeight: 40
implicitWidth: {
var w = columnSource[column].width
if(!w){
w = columnSource[column].minimumWidth
}
if(!w){
w = d.defaultItemWidth
}
return w
}
Rectangle{
height: 18
radius: 1.5
color: FluTheme.primaryColor.dark
width: 3
visible: d.currentRow === table_model.getRow(row).__index && column === 0
anchors{
verticalCenter: parent.verticalCenter
left: parent.left
leftMargin: 3
}
}
MouseArea{
anchors.fill: parent
acceptedButtons: Qt.LeftButton
onPressed:{
closeEditor()
}
onCanceled: {
}
onReleased: {
}
onDoubleClicked:{
if(typeof(display) == "object"){
return
}
item_loader.sourceComponent = d.obtEditDelegate(column,row,item_table)
}
onClicked:
(event)=>{
d.currentRow = table_model.getRow(row).__index
item_loader.sourceComponent = undefined
event.accepted = true
}
}
Loader{
property var itemModel: model
property var modelData: display
property var tableView: table_view
property var tableModel: table_model
property var position: item_table.position
property int row: position.y
property int column: position.x
property var options: {
if(typeof(modelData) == "object"){
return modelData.options
}
return {}
}
anchors.fill: parent
sourceComponent: {
if(typeof(modelData) == "object"){
return modelData.comId
}
return com_text
}
}
MouseArea{
acceptedButtons: Qt.NoButton
anchors.fill: parent
hoverEnabled: true
z:99
onPositionChanged: {
d.rowHoverIndex = row
}
onEntered: {
d.rowHoverIndex = row
}
} }
} }
MouseArea{ }
anchors.fill: parent MouseArea{
acceptedButtons: Qt.LeftButton id:item_loader_layout
onPressed:{ acceptedButtons: Qt.NoButton
closeEditor() visible: item_loader.sourceComponent
} hoverEnabled: true
onCanceled: { z:2
} onEntered: {
onReleased: { d.rowHoverIndex = -1
}
onDoubleClicked:{
if(typeof(display) == "object"){
return
}
item_loader.sourceComponent = d.obtEditDelegate(column,row,item_table)
}
onClicked:
(event)=>{
d.currentRow = table_model.getRow(row).__index
item_loader.sourceComponent = undefined
event.accepted = true
}
} }
Loader{ Loader{
property var itemModel: model id:item_loader
property var modelData: display property var display
property var tableView: table_view property int column
property var tableModel: table_model property int row
property var position: item_table.position property var tableView: control
property int row: position.y sourceComponent: undefined
property int column: position.x
property var options: {
if(typeof(modelData) == "object"){
return modelData.options
}
return {}
}
anchors.fill: parent anchors.fill: parent
sourceComponent: { onDisplayChanged: {
if(typeof(modelData) == "object"){ var obj = table_model.getRow(row)
return modelData.comId obj[columnSource[column].dataIndex] = display
} table_model.setRow(row,obj)
return com_text
} }
} }
MouseArea{
acceptedButtons: Qt.NoButton
anchors.fill: parent
hoverEnabled: true
z:99
onContainsMouseChanged: {
if(containsMouse){
d.rowHoverIndex = row
}else{
d.rowHoverIndex = -1
}
}
}
}
}
Loader{
id:item_loader
z:2
property var display
property int column
property int row
property var tableView: control
sourceComponent: undefined
onDisplayChanged: {
var obj = table_model.getRow(row)
obj[columnSource[column].dataIndex] = display
table_model.setRow(row,obj)
}
}
MouseArea{
acceptedButtons: Qt.NoButton
anchors.fill: item_loader
enabled: item_loader.sourceComponent
hoverEnabled: true
z:10
onContainsMouseChanged: {
if(containsMouse){
d.rowHoverIndex = item_loader.row
}else{
d.rowHoverIndex = -1
}
} }
} }
} }
@ -361,7 +362,6 @@ Rectangle {
id:com_handle id:com_handle
Item {} Item {}
} }
Component{ Component{
id:com_column_text id:com_column_text
FluText { FluText {

10
src/Qt6/imports/FluentUI/Controls/FluTextBox.qml
View File

@ -38,7 +38,15 @@ TextField{
return placeholderNormalColor return placeholderNormalColor
} }
selectByMouse: true selectByMouse: true
rightPadding: icon_end.visible ? 66 : 40 rightPadding: {
var w = 30
if(control.cleanEnabled === false){
w = 0
}
if(control.readOnly)
w = 0
return icon_end.visible ? w+36 : w+10
}
background: FluTextBoxBackground{ background: FluTextBoxBackground{
inputItem: control inputItem: control
implicitWidth: 240 implicitWidth: 240