amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-10-06 12:13:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhuzichu 2023-09-15 19:11:55 +08:00
parent e6d9de34ea
commit be194e7624
16 changed files with 637 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
example/qml-Qt6/page/T_InfoBar.qml
View File

@ -12,7 +12,7 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
Layout.topMargin: 20
height: 240
height: 270
paddings: 10
ColumnLayout{
spacing: 14
@ -23,7 +23,7 @@ FluScrollablePage{
FluButton{
text:"Info"
onClicked: {
showInfo("这是一个Info样式的InfoBar")
showInfo("这是一个Info样式的InfoBar",0,"123")
}
}
FluButton{
@ -44,6 +44,12 @@ FluScrollablePage{
showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")
}
}
FluButton{
text:"手动关闭的InfoBar"
onClicked: {
showInfo("这是一个Info样式的InfoBar",0,"支持手动关闭")
}
}
FluButton{
text:"Loading"
onClicked: {

50
example/qml-Qt6/page/T_TreeView.qml
View File

@ -12,7 +12,7 @@ FluScrollablePage {
function treeData(){
const dig = (path = '0', level = 4) => {
const list = [];
for (let i = 0; i < 6; i += 1) {
for (let i = 0; i < 10; i += 1) {
const key = `${path}-${i}`;
const treeNode = {
title: key,
@ -32,33 +32,71 @@ FluScrollablePage {
Layout.fillWidth: true
Layout.topMargin: 10
paddings: 10
height: 60
FluText{
text:"共计：%1条数据".arg(tree_view.count())
height: 80
Column{
anchors.verticalCenter: parent.verticalCenter
spacing: 10
FluText{
text:"高性能树控件，新的TreeView用TableView实现！！"
}
FluText{
text:"共计：%1条数据，当前显示的%2条数据".arg(tree_view.count()).arg(tree_view.visibleCount())
}
}
}
FluArea{
Layout.fillWidth: true
Layout.topMargin: 10
paddings: 10
height: 400
Item{
anchors.fill: tree_view
FluShadow{}
}
FluTreeView{
id:tree_view
width:240
width:slider_width.value
anchors{
top:parent.top
left:parent.left
bottom:parent.bottom
}
showLine: switch_showline.checked
Component.onCompleted: {
var data = treeData()
dataSource = data
}
}
Column{
anchors{
top:parent.top
topMargin: 10
bottomMargin: 10
rightMargin: 10
bottom:parent.bottom
right: parent.right
}
RowLayout{
spacing: 10
FluText{
text:"width:"
Layout.alignment: Qt.AlignVCenter
}
FluSlider{
id:slider_width
value: 200
from: 160
to:320
}
}
FluToggleSwitch{
id:switch_showline
text:"showLine"
checked: true
}
}
}
CodeExpander{
Layout.fillWidth: true
Layout.topMargin: -1

10
example/qml/page/T_InfoBar.qml
View File

@ -13,7 +13,7 @@ FluScrollablePage{
FluArea{
Layout.fillWidth: true
Layout.topMargin: 20
height: 240
height: 270
paddings: 10
ColumnLayout{
spacing: 14
@ -24,7 +24,7 @@ FluScrollablePage{
FluButton{
text:"Info"
onClicked: {
showInfo("这是一个Info样式的InfoBar")
showInfo("这是一个Info样式的InfoBar",0,"123")
}
}
FluButton{
@ -45,6 +45,12 @@ FluScrollablePage{
showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")
}
}
FluButton{
text:"手动关闭的InfoBar"
onClicked: {
showInfo("这是一个Info样式的InfoBar",0,"支持手动关闭")
}
}
FluButton{
text:"Loading"
onClicked: {

50
example/qml/page/T_TreeView.qml
View File

@ -13,7 +13,7 @@ FluScrollablePage {
function treeData(){
const dig = (path = '0', level = 4) => {
const list = [];
for (let i = 0; i < 6; i += 1) {
for (let i = 0; i < 10; i += 1) {
const key = `${path}-${i}`;
const treeNode = {
title: key,
@ -33,33 +33,71 @@ FluScrollablePage {
Layout.fillWidth: true
Layout.topMargin: 10
paddings: 10
height: 60
FluText{
text:"共计：%1条数据".arg(tree_view.count())
height: 80
Column{
anchors.verticalCenter: parent.verticalCenter
spacing: 10
FluText{
text:"高性能树控件，新的TreeView用TableView实现！！"
}
FluText{
text:"共计：%1条数据，当前显示的%2条数据".arg(tree_view.count()).arg(tree_view.visibleCount())
}
}
}
FluArea{
Layout.fillWidth: true
Layout.topMargin: 10
paddings: 10
height: 400
Item{
anchors.fill: tree_view
FluShadow{}
}
FluTreeView{
id:tree_view
width:240
width:slider_width.value
anchors{
top:parent.top
left:parent.left
bottom:parent.bottom
}
showLine: switch_showline.checked
Component.onCompleted: {
var data = treeData()
dataSource = data
}
}
Column{
anchors{
top:parent.top
topMargin: 10
bottomMargin: 10
rightMargin: 10
bottom:parent.bottom
right: parent.right
}
RowLayout{
spacing: 10
FluText{
text:"width:"
Layout.alignment: Qt.AlignVCenter
}
FluSlider{
id:slider_width
value: 200
from: 160
to:320
}
}
FluToggleSwitch{
id:switch_showline
text:"showLine"
checked: true
}
}
}
CodeExpander{
Layout.fillWidth: true
Layout.topMargin: -1

61
src/FluTreeModel.cpp Normal file
View File

@ -0,0 +1,61 @@
#include "FluTreeModel.h"
#include <QMetaEnum>
FluTreeModel::FluTreeModel(QObject *parent)
: QAbstractTableModel{parent}
{
}
int FluTreeModel::rowCount(const QModelIndex &parent) const {
return _rows.count();
};
int FluTreeModel::columnCount(const QModelIndex &parent) const {
return 1;;
};
QVariant FluTreeModel::data(const QModelIndex &index, int role) const {
switch (role) {
case Qt::DisplayRole:
return QVariant::fromValue(_rows.at(index.row()));
default:
break;
}
return QVariant();
};
QHash<int, QByteArray> FluTreeModel::roleNames() const {
return { {Qt::DisplayRole, "display"} };
};
void FluTreeModel::setData(QList<QObject*> data){
beginResetModel();
_rows = data;
endResetModel();
}
void FluTreeModel::removeRows(int row,int count){
if (row < 0 || row + count > _rows.size())
return;
beginRemoveRows(QModelIndex(),row, row + count - 1);
for (int i = 0; i < count; ++i) {
_rows.removeAt(row);
}
endRemoveRows();
}
void FluTreeModel::insertRows(int row,QList<QObject*> data){
if (row < 0 || row > _rows.size())
return;
beginInsertRows(QModelIndex(), row, row + data.size() - 1);
for (const auto& item : data) {
_rows.insert(row++, item);
}
endInsertRows();
}
QObject* FluTreeModel::getRow(int row){
return _rows.at(row);
}

27
src/FluTreeModel.h Normal file
View File

@ -0,0 +1,27 @@
#ifndef FLUTREEMODEL_H
#define FLUTREEMODEL_H
#include <QObject>
#include <QAbstractTableModel>
#include <QtQml/qqml.h>
class FluTreeModel : public QAbstractTableModel
{
Q_OBJECT
QML_NAMED_ELEMENT(FluTreeModel)
QML_ADDED_IN_MINOR_VERSION(1)
public:
explicit FluTreeModel(QObject *parent = nullptr);
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QHash<int, QByteArray> roleNames() const override;
Q_INVOKABLE void removeRows(int row,int count);
Q_INVOKABLE void insertRows(int row,QList<QObject*> data);
Q_INVOKABLE QObject* getRow(int row);
Q_INVOKABLE void setData(QList<QObject*> data);
private:
QList<QObject*> _rows;
};
#endif // FLUTREEMODEL_H

2
src/FluentUI.cpp
View File

@ -13,6 +13,7 @@
#include "FluWatermark.h"
#include "FluCaptcha.h"
#include "FluEventBus.h"
#include "FluTreeModel.h"
#include "FluViewModel.h"
#include "Screenshot.h"
#include "QRCode.h"
@ -53,6 +54,7 @@ void FluentUI::registerTypes(const char *uri){
qmlRegisterType<HttpRequest>(uri,major,minor,"HttpRequest");
qmlRegisterType<FluEvent>(uri,major,minor,"FluEvent");
qmlRegisterType<FluViewModel>(uri,major,minor,"FluViewModel");
qmlRegisterType<FluTreeModel>(uri,major,minor,"FluTreeModel");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/ColorPicker/ColorPicker.qml"),uri,major,minor,"ColorPicker");
qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/ColorPicker/Content/Checkerboard.qml"),uri,major,minor,"Checkerboard");

39
src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
View File

@ -83,7 +83,7 @@ FluObject {
}
Timer {
id:delayTimer
interval: duration; running: true; repeat: true
interval: duration; running: duration > 0; repeat: duration > 0
onTriggered: content.close();
}
Loader{
@ -184,11 +184,48 @@ FluObject {
}
}
Column{
spacing: 5
FluText{
text:_super.text
wrapMode: Text.WrapAnywhere
width: Math.min(implicitWidth,mcontrol.maxWidth)
}
FluText{
text: _super.moremsg
visible: _super.moremsg
wrapMode : Text.WordWrap
textColor: FluColors.Grey120
}
}
FluIconButton{
iconSource: FluentIcons.ChromeClose
iconSize: 10
y:5
x:parent.width-35
visible: _super.duration<=0
iconColor: {
if(FluTheme.dark){
switch(_super.type){
case mcontrol.const_success: return Qt.rgba(108/255,203/255,95/255,1);
case mcontrol.const_warning: return Qt.rgba(252/255,225/255,0/255,1);
case mcontrol.const_info: return FluTheme.primaryColor.lighter;
case mcontrol.const_error: return Qt.rgba(255/255,153/255,164/255,1);
}
return "#FFFFFF"
}else{
switch(_super.type){
case mcontrol.const_success: return "#0f7b0f";
case mcontrol.const_warning: return "#9d5d00";
case mcontrol.const_info: return "#0066b4";
case mcontrol.const_error: return "#c42b1c";
}
return "#FFFFFF"
}
}
onClicked: _super.close()
}
}
}
}

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

@ -7,6 +7,7 @@ QtObject {
property int depth: 0
property bool isExpanded: true
property var __parent
property int __childIndex: 0
property bool __expanded:{
var p = __parent;
while (p) {

201
src/Qt5/imports/FluentUI/Controls/FluTreeView.qml
View File

@ -6,14 +6,14 @@ import Qt.labs.qmlmodels 1.0
import FluentUI 1.0
Item {
property int currentIndex : -1
property var dataSource
property bool showLine: true
property color lineColor: FluTheme.dark ? Qt.rgba(111/255,111/255,111/255,1) : Qt.rgba(217/255,217/255,217/255,1)
id:control
QtObject {
id:d
signal refreshLayout()
onRefreshLayout: {
table_view.forceLayout()
}
property var rowData: []
function handleTree(treeData) {
var comItem = Qt.createComponent("FluTreeItem.qml");
if (comItem.status !== Component.Ready) {
@ -22,15 +22,16 @@ Item {
var stack = []
var rawData = []
for (var item of treeData) {
stack.push({node:item,depth:0,isExpanded:true,__parent:undefined})
stack.push({node:item,depth:0,isExpanded:true,__parent:undefined,__childIndex:0})
}
stack = stack.reverse()
var index =0
while (stack.length > 0) {
const { node, depth,isExpanded,__parent} = stack.pop();
const { node, depth,isExpanded,__parent,__childIndex} = stack.pop();
node.depth = depth;
node.isExpanded = isExpanded;
node.__parent = __parent;
node.__childIndex = __childIndex;
var objItem = comItem.createObject(table_view);
objItem.title = node.title
objItem.key = node.key
@ -38,13 +39,16 @@ Item {
objItem.isExpanded = node.isExpanded
objItem.__parent = node.__parent
objItem.children = node.children
objItem.__childIndex = node.__childIndex
objItem.index = index
index = index + 1;
rawData.push({display:objItem})
rawData.push(objItem)
if (node.children && node.children.length > 0) {
const children = node.children.reverse();
var childIndex = children.length-1
for (const child of children) {
stack.push({ node: child, depth: depth + 1,isExpanded:true,__parent:objItem});
stack.push({ node: child, depth: depth + 1,isExpanded:true,__parent:objItem,__childIndex:childIndex});
childIndex=childIndex-1;
}
}
}
@ -52,52 +56,139 @@ Item {
}
}
onDataSourceChanged: {
table_model.clear()
var data = d.handleTree(dataSource)
table_model.rows = data
table_view.forceLayout()
console.debug("共计：%1条数据".arg(table_model.rowCount))
d.rowData = d.handleTree(dataSource)
tree_model.setData(d.rowData)
}
FluTreeModel{
id:tree_model
}
Timer{
id:timer_refresh
interval: 10
onTriggered: {
table_view.forceLayout()
}
TableModel {
id:table_model
TableModelColumn { display: "display" }
}
TableView{
id:table_view
ScrollBar.horizontal: FluScrollBar{}
ScrollBar.vertical: FluScrollBar{}
boundsBehavior: Flickable.StopAtBounds
model: table_model
model: tree_model
clip: true
anchors.fill: parent
rowHeightProvider: function(row) {
if(table_model.getRow(row).display.__expanded){
return 38
}
return 0
onContentYChanged:{
timer_refresh.restart()
}
reuseItems: false
delegate: Item {
implicitWidth: 46 + item_layout_text.width + 30*display.depth
RowLayout{
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 14 + 30*display.depth
FluIcon{
rotation: display.isExpanded?0:-90
iconSource:FluentIcons.ChevronDown
iconSize: 15
Layout.alignment: Qt.AlignVCenter
opacity: {
property bool hasChildren: {
if(display.children){
return true
}
return false
}
MouseArea{
anchors.fill: parent
property var itemData: display
property bool vlineVisible: display.depth !== 0 && control.showLine
property bool hlineVisible: display.depth !== 0 && control.showLine && !hasChildren
property bool isLastIndex : {
if(display.__parent && display.__parent.children){
return display.__childIndex === display.__parent.children.length-1
}
return false
}
property bool isCurrent: control.currentIndex === row
implicitWidth: 46 + item_layout_text.width + 30*display.depth
implicitHeight: 30
Rectangle{
width: 1
color: control.lineColor
visible: hlineVisible
height: isLastIndex ? parent.height/2 : parent.height
anchors{
top: parent.top
right: layout_row.left
}
}
Rectangle{
height: 1
color: control.lineColor
visible: hlineVisible
width: 18
anchors{
right: layout_row.left
rightMargin: -18
verticalCenter: parent.verticalCenter
}
}
Repeater{
model: Math.max(display.depth-1,0)
delegate: Rectangle{
required property int index
width: 1
color: control.lineColor
visible: vlineVisible
anchors{
top:parent.top
bottom: parent.bottom
left: parent.left
leftMargin: 30*(index+2) - 8
}
}
}
RowLayout{
id:layout_row
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 14 + 30*display.depth
FluIconButton{
Layout.preferredWidth: 20
Layout.preferredHeight: 20
enabled: opacity
opacity: hasChildren
contentItem: FluIcon{
rotation: itemData.isExpanded?0:-90
iconSource:FluentIcons.ChevronDown
iconSize: 16
Behavior on rotation{
NumberAnimation{
duration: FluTheme.enableAnimation ? 167 : 0
easing.type: Easing.OutCubic
}
}
}
onClicked: {
display.isExpanded = !display.isExpanded
d.refreshLayout()
var isExpanded = !itemData.isExpanded
itemData.isExpanded = isExpanded
var i,obj
if(isExpanded){
for( i=0;i<d.rowData.length;i++){
obj = d.rowData[i]
if(obj === itemData){
var data = []
for(var j=i+1;j<d.rowData.length;j++){
obj = d.rowData[j]
if(obj.depth === itemData.depth){
break
}
if(obj.__expanded){
data.push(obj)
}
}
tree_model.insertRows(row+1,data)
break
}
}
}else{
var removeCount = 0
for( i=row+1;i<tree_model.rowCount();i++){
obj = tree_model.getRow(i)
if(obj.depth === itemData.depth){
break
}
removeCount = removeCount + 1;
}
tree_model.removeRows(row+1,removeCount)
}
}
}
@ -107,17 +198,32 @@ Item {
Layout.preferredWidth: item_text.implicitWidth+14
Layout.preferredHeight:item_text.implicitHeight+14
Layout.alignment: Qt.AlignVCenter
HoverHandler{
id:item_hover_text
Rectangle{
width: 3
height: 18
radius: 1.5
color: FluTheme.primaryColor.dark
visible: isCurrent
anchors{
verticalCenter: parent.verticalCenter
}
}
MouseArea{
id:item_text_mousearea
anchors.fill: parent
hoverEnabled: true
onClicked: {
control.currentIndex = row
}
}
color: {
if(FluTheme.dark){
if(item_hover_text.hovered){
if(item_text_mousearea.containsMouse || isCurrent){
return Qt.rgba(1,1,1,0.03)
}
return Qt.rgba(0,0,0,0)
}else{
if(item_hover_text.hovered){
if(item_text_mousearea.containsMouse || isCurrent){
return Qt.rgba(0,0,0,0.03)
}
return Qt.rgba(0,0,0,0)
@ -127,11 +233,11 @@ Item {
id:item_text
text: display.title
anchors.centerIn: parent
color:{
if(item_text_mousearea.pressed){
return FluTheme.dark ? FluColors.Grey80 : FluColors.Grey120
}
MouseArea{
anchors.fill: parent
onClicked: {
d.refreshLayout()
return FluTheme.dark ? FluColors.White : FluColors.Grey220
}
}
}
@ -139,6 +245,9 @@ Item {
}
}
function count(){
return table_model.rowCount
return d.rowData.length
}
function visibleCount(){
return table_view.rows
}
}

2
src/Qt5/imports/FluentUI/Controls/FluWindow.qml
View File

@ -107,9 +107,11 @@ Window {
MouseArea{
anchors.fill: parent
onClicked: {
if (cancel){
popup_loading.visible = false
}
}
}
ColumnLayout{
spacing: 8
anchors.centerIn: parent

39
src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
View File

@ -83,7 +83,7 @@ FluObject {
}
Timer {
id:delayTimer
interval: duration; running: true; repeat: true
interval: duration; running: duration > 0; repeat: duration > 0
onTriggered: content.close();
}
Loader{
@ -184,11 +184,48 @@ FluObject {
}
}
Column{
spacing: 5
FluText{
text:_super.text
wrapMode: Text.WrapAnywhere
width: Math.min(implicitWidth,mcontrol.maxWidth)
}
FluText{
text: _super.moremsg
visible: _super.moremsg
wrapMode : Text.WordWrap
textColor: FluColors.Grey120
}
}
FluIconButton{
iconSource: FluentIcons.ChromeClose
iconSize: 10
y:5
x:parent.width-35
visible: _super.duration<=0
iconColor: {
if(FluTheme.dark){
switch(_super.type){
case mcontrol.const_success: return Qt.rgba(108/255,203/255,95/255,1);
case mcontrol.const_warning: return Qt.rgba(252/255,225/255,0/255,1);
case mcontrol.const_info: return FluTheme.primaryColor.lighter;
case mcontrol.const_error: return Qt.rgba(255/255,153/255,164/255,1);
}
return "#FFFFFF"
}else{
switch(_super.type){
case mcontrol.const_success: return "#0f7b0f";
case mcontrol.const_warning: return "#9d5d00";
case mcontrol.const_info: return "#0066b4";
case mcontrol.const_error: return "#c42b1c";
}
return "#FFFFFF"
}
}
onClicked: _super.close()
}
}
}
}

9
src/Qt6/imports/FluentUI/Controls/FluPage.qml
View File

@ -8,6 +8,7 @@ Item {
property int launchMode: FluPageType.SingleTop
property bool animDisabled: false
property string url : ""
signal animationEnd()
id: control
opacity: visible
visible: false
@ -30,5 +31,13 @@ Item {
}
Component.onCompleted: {
visible = true
timer.restart()
}
Timer{
id:timer
interval: !animDisabled && FluTheme.enableAnimation ? 200 : 0
onTriggered: {
control.animationEnd()
}
}
}

1
src/Qt6/imports/FluentUI/Controls/FluTreeItem.qml
View File

@ -7,6 +7,7 @@ QtObject {
property int depth: 0
property bool isExpanded: true
property var __parent
property int __childIndex: 0
property bool __expanded:{
var p = __parent;
while (p) {

202
src/Qt6/imports/FluentUI/Controls/FluTreeView.qml
View File

@ -6,14 +6,14 @@ import Qt.labs.qmlmodels
import FluentUI
Item {
property int currentIndex : -1
property var dataSource
property bool showLine: true
property color lineColor: FluTheme.dark ? Qt.rgba(111/255,111/255,111/255,1) : Qt.rgba(217/255,217/255,217/255,1)
id:control
QtObject {
id:d
signal refreshLayout()
onRefreshLayout: {
table_view.forceLayout()
}
property var rowData: []
function handleTree(treeData) {
var comItem = Qt.createComponent("FluTreeItem.qml");
if (comItem.status !== Component.Ready) {
@ -22,15 +22,16 @@ Item {
var stack = []
var rawData = []
for (var item of treeData) {
stack.push({node:item,depth:0,isExpanded:true,__parent:undefined})
stack.push({node:item,depth:0,isExpanded:true,__parent:undefined,__childIndex:0})
}
stack = stack.reverse()
var index =0
while (stack.length > 0) {
const { node, depth,isExpanded,__parent} = stack.pop();
const { node, depth,isExpanded,__parent,__childIndex} = stack.pop();
node.depth = depth;
node.isExpanded = isExpanded;
node.__parent = __parent;
node.__childIndex = __childIndex;
var objItem = comItem.createObject(table_view);
objItem.title = node.title
objItem.key = node.key
@ -38,13 +39,16 @@ Item {
objItem.isExpanded = node.isExpanded
objItem.__parent = node.__parent
objItem.children = node.children
objItem.__childIndex = node.__childIndex
objItem.index = index
index = index + 1;
rawData.push({display:objItem})
rawData.push(objItem)
if (node.children && node.children.length > 0) {
const children = node.children.reverse();
var childIndex = children.length-1
for (const child of children) {
stack.push({ node: child, depth: depth + 1,isExpanded:true,__parent:objItem});
stack.push({ node: child, depth: depth + 1,isExpanded:true,__parent:objItem,__childIndex:childIndex});
childIndex=childIndex-1;
}
}
}
@ -52,54 +56,139 @@ Item {
}
}
onDataSourceChanged: {
table_model.clear()
var data = d.handleTree(dataSource)
table_model.rows = data
d.rowData = d.handleTree(dataSource)
tree_model.setData(d.rowData)
}
FluTreeModel{
id:tree_model
}
Timer{
id:timer_refresh
interval: 10
onTriggered: {
table_view.forceLayout()
console.debug("共计：%1条数据".arg(table_model.rowCount))
}
TableModel {
id:table_model
TableModelColumn { display: "display" }
}
ListView{
anchors.fill: parent
TableView{
id:table_view
ScrollBar.horizontal: FluScrollBar{}
ScrollBar.vertical: FluScrollBar{}
boundsBehavior: Flickable.StopAtBounds
model: table_model
model: tree_model
clip: true
anchors.fill: parent
rowHeightProvider: function(row) {
if(table_model.getRow(row).display.__expanded){
return 38
}
return 0
onContentYChanged:{
timer_refresh.restart()
}
reuseItems: false
delegate: Item {
implicitWidth: 46 + item_layout_text.width + 30*display.depth
RowLayout{
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 14 + 30*display.depth
FluIcon{
rotation: display.isExpanded?0:-90
iconSource:FluentIcons.ChevronDown
iconSize: 15
Layout.alignment: Qt.AlignVCenter
opacity: {
property bool hasChildren: {
if(display.children){
return true
}
return false
}
MouseArea{
anchors.fill: parent
property var itemData: display
property bool vlineVisible: display.depth !== 0 && control.showLine
property bool hlineVisible: display.depth !== 0 && control.showLine && !hasChildren
property bool isLastIndex : {
if(display.__parent && display.__parent.children){
return display.__childIndex === display.__parent.children.length-1
}
return false
}
property bool isCurrent: control.currentIndex === row
implicitWidth: 46 + item_layout_text.width + 30*display.depth
implicitHeight: 30
Rectangle{
width: 1
color: control.lineColor
visible: hlineVisible
height: isLastIndex ? parent.height/2 : parent.height
anchors{
top: parent.top
right: layout_row.left
}
}
Rectangle{
height: 1
color: control.lineColor
visible: hlineVisible
width: 18
anchors{
right: layout_row.left
rightMargin: -18
verticalCenter: parent.verticalCenter
}
}
Repeater{
model: Math.max(display.depth-1,0)
delegate: Rectangle{
required property int index
width: 1
color: control.lineColor
visible: vlineVisible
anchors{
top:parent.top
bottom: parent.bottom
left: parent.left
leftMargin: 30*(index+2) - 8
}
}
}
RowLayout{
id:layout_row
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 14 + 30*display.depth
FluIconButton{
Layout.preferredWidth: 20
Layout.preferredHeight: 20
enabled: opacity
opacity: hasChildren
contentItem: FluIcon{
rotation: itemData.isExpanded?0:-90
iconSource:FluentIcons.ChevronDown
iconSize: 16
Behavior on rotation{
NumberAnimation{
duration: FluTheme.enableAnimation ? 167 : 0
easing.type: Easing.OutCubic
}
}
}
onClicked: {
display.isExpanded = !display.isExpanded
d.refreshLayout()
var isExpanded = !itemData.isExpanded
itemData.isExpanded = isExpanded
var i,obj
if(isExpanded){
for( i=0;i<d.rowData.length;i++){
obj = d.rowData[i]
if(obj === itemData){
var data = []
for(var j=i+1;j<d.rowData.length;j++){
obj = d.rowData[j]
if(obj.depth === itemData.depth){
break
}
if(obj.__expanded){
data.push(obj)
}
}
tree_model.insertRows(row+1,data)
break
}
}
}else{
var removeCount = 0
for( i=row+1;i<tree_model.rowCount();i++){
obj = tree_model.getRow(i)
if(obj.depth === itemData.depth){
break
}
removeCount = removeCount + 1;
}
tree_model.removeRows(row+1,removeCount)
}
}
}
@ -109,17 +198,32 @@ Item {
Layout.preferredWidth: item_text.implicitWidth+14
Layout.preferredHeight:item_text.implicitHeight+14
Layout.alignment: Qt.AlignVCenter
HoverHandler{
id:item_hover_text
Rectangle{
width: 3
height: 18
radius: 1.5
color: FluTheme.primaryColor.dark
visible: isCurrent
anchors{
verticalCenter: parent.verticalCenter
}
}
MouseArea{
id:item_text_mousearea
anchors.fill: parent
hoverEnabled: true
onClicked: {
control.currentIndex = row
}
}
color: {
if(FluTheme.dark){
if(item_hover_text.hovered){
if(item_text_mousearea.containsMouse || isCurrent){
return Qt.rgba(1,1,1,0.03)
}
return Qt.rgba(0,0,0,0)
}else{
if(item_hover_text.hovered){
if(item_text_mousearea.containsMouse || isCurrent){
return Qt.rgba(0,0,0,0.03)
}
return Qt.rgba(0,0,0,0)
@ -129,12 +233,11 @@ Item {
id:item_text
text: display.title
anchors.centerIn: parent
color:{
if(item_text_mousearea.pressed){
return FluTheme.dark ? FluColors.Grey80 : FluColors.Grey120
}
MouseArea{
anchors.fill: parent
onClicked: {
d.refreshLayout()
}
return FluTheme.dark ? FluColors.White : FluColors.Grey220
}
}
}
@ -142,6 +245,9 @@ Item {
}
}
function count(){
return table_model.rowCount
return d.rowData.length
}
function visibleCount(){
return table_view.rows
}
}

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

@ -106,9 +106,11 @@ Window {
MouseArea{
anchors.fill: parent
onClicked: {
if (cancel){
popup_loading.visible = false
}
}
}
ColumnLayout{
spacing: 8
anchors.centerIn: parent