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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-03-23 22:17:03 +08:00
parent 7e1490f8f4
commit 37101c97c5
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example/CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
project(example VERSION 1.0 LANGUAGES CXX) project(example VERSION 1.0)
#配置通用编译 #配置通用编译
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
@ -49,9 +49,13 @@ configure_file(
) )
#遍历所有Cpp文件 #遍历所有Cpp文件
message("---------->${filename}")
file(GLOB_RECURSE CPP_FILES *.cpp *.h) file(GLOB_RECURSE CPP_FILES *.cpp *.h)
foreach(filepath ${CPP_FILES}) foreach(filepath ${CPP_FILES})
string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath}) string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
message(${filename})
list(APPEND sources_files ${filename}) list(APPEND sources_files ${filename})
endforeach(filepath) endforeach(filepath)

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

@ -192,10 +192,7 @@ Rectangle {
property var rowObject : control.getRow(row) property var rowObject : control.getRow(row)
property var itemModel: model property var itemModel: model
property bool editVisible: { property bool editVisible: {
if(d.editPosition === undefined){ if(rowObject && d.editPosition && d.editPosition._key === rowObject._key && d.editPosition.column === column){
return false
}
if(d.editPosition._key === rowObject._key && d.editPosition.column === column){
return true return true
} }
return false return false

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

@ -193,10 +193,7 @@ Rectangle {
property var rowObject : control.getRow(row) property var rowObject : control.getRow(row)
property var itemModel: model property var itemModel: model
property bool editVisible: { property bool editVisible: {
if(d.editPosition === undefined){ if(rowObject && d.editPosition && d.editPosition._key === rowObject._key && d.editPosition.column === column){
return false
}
if(d.editPosition._key === rowObject._key && d.editPosition.column === column){
return true return true
} }
return false return false
@ -383,7 +380,7 @@ Rectangle {
model: table_sort_model model: table_sort_model
clip: true clip: true
onRowsChanged: { onRowsChanged: {
closeEditor() control.closeEditor()
} }
delegate: com_table_delegate delegate: com_table_delegate
FluLoader{ FluLoader{
@ -496,7 +493,7 @@ Rectangle {
} }
onClicked: onClicked:
(event)=>{ (event)=>{
closeEditor() control.closeEditor()
} }
} }
FluLoader{ FluLoader{
@ -627,7 +624,7 @@ Rectangle {
} }
onClicked: onClicked:
(event)=>{ (event)=>{
closeEditor() control.closeEditor()
} }
} }
MouseArea{ MouseArea{