update

🐛 修复 windows 下生成 dll 库带 linux 前缀导致查找不到控件

.github/workflows/ubuntu.yml

@@ -38,7 +38,7 @@ jobs:
           arch: ${{ matrix.qt_arch }}
           modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
       - name: ubuntu install GL library
-        run: sudo apt-get install -y libglew-dev libglfw3-dev qml-module-qtquick-controls qml-module-qtquick-controls2
+        run: sudo apt-get install -y libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-sync-dev  libxcb-render-util0-dev libxcb-shm0-dev
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1

README.md

@@ -62,6 +62,12 @@
 |FluDatePicker|日期选择器||
 |FluMenu|菜单Popup||
 |FluNavigationView|响应式导航布局||
+|FluScrollbar|滚动条||
+|FluToggleButton|开关按钮||
+|FluPagination|分页组件||
+|FluTableView|表格组件||
+|FluMediaPlayer|播放器||
+|FluFlipView|FlipView||
 
 # 部分效果预览
 
@@ -77,6 +83,10 @@
 
 ![](doc/preview/theme.png)
 
+## TableView表格组件
+
+![](doc/preview/tableview.png)
+
 ## FluTreeView树组件
 
 ![](doc/preview/treeview.png)
@@ -85,13 +95,5 @@
 
 ![](doc/preview/carousel.png)
 
-## InfoBar提示框组件
-
-![](doc/preview/infobar.png)
-
-## 多窗口路由跳转
-
-![](doc/preview/multiwindow.png)
-
 ### ⚡ Visitor count
 ![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)

example/CMakeLists.txt

@@ -7,6 +7,8 @@ set(CMAKE_AUTOUIC ON)
 
 set(CMAKE_CXX_STANDARD 17)
 
+file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
+
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
   set(platform 64)
 else()
@@ -44,20 +46,17 @@ add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS} ${QT_RESOURCES} ${RC_ICONS}
 
 if(WIN32)
     if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
-        file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/msvc/*.dll)
-        add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy
-            ${DLL_FILES}
-            ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-        )
+        set(DLLPATH ${CMAKE_CURRENT_SOURCE_DIR}/../third/msvc/*.dll)
     else()
-        file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/mingw/*.dll)
-        add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy
-            ${DLL_FILES}
-            ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-        )
+        set(DLLPATH ${CMAKE_CURRENT_SOURCE_DIR}/../third/mingw/*.dll)
     endif()
+    string(REPLACE "/" ${PATH_SEPARATOR} DLLPATH "${DLLPATH}")
+    file(GLOB DLL_FILES ${DLLPATH})
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+        ${DLL_FILES}
+        ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+    )
 endif()
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE

example/T_InfoBar.qml

@@ -52,12 +52,12 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        code:'  showInfo("这是一个Info样式的InfoBar")
+        code:'showInfo("这是一个Info样式的InfoBar")
 
-    showWarning("这是一个Warning样式的InfoBar")
+showWarning("这是一个Warning样式的InfoBar")
 
-    showError("这是一个Error样式的InfoBar")
+showError("这是一个Error样式的InfoBar")
 
-    showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")'
+showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")'
     }
 }

example/T_StatusView.qml

@@ -0,0 +1,91 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Window
+import FluentUI
+import "./component"
+
+FluScrollablePage{
+
+    title:"StatusView"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        id:layout_actions
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 50
+        paddings: 10
+        RowLayout{
+            spacing: 14
+            FluDropDownButton{
+                id:btn_status_mode
+                Layout.preferredWidth: 140
+                text:"Loading"
+                items:[
+                    FluMenuItem{
+                        text:"Loading"
+                        onClicked: {
+                            btn_status_mode.text = text
+                            status_view.statusMode = FluStatusView.Loading
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Empty"
+                        onClicked: {
+                            btn_status_mode.text = text
+                            status_view.statusMode = FluStatusView.Empty
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Error"
+                        onClicked: {
+                            btn_status_mode.text = text
+                            status_view.statusMode = FluStatusView.Error
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Success"
+                        onClicked: {
+                            btn_status_mode.text = text
+                            status_view.statusMode = FluStatusView.Success
+                        }
+                    }
+                ]
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 10
+        height: 380
+        paddings: 10
+        FluStatusView{
+            id:status_view
+            anchors.fill: parent
+            onErrorClicked:{
+                showError("点击重新加载")
+            }
+            Rectangle {
+                anchors.fill: parent
+                color:FluTheme.primaryColor.dark
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluStatusView{
+    anchors.fill: parent
+    statusMode: FluStatusView.Loading
+    Rectangle{
+        anchors.fill: parent
+        color:FluTheme.primaryColor.dark
+    }
+}'
+    }
+
+}

example/T_TableView.qml

@@ -45,12 +45,10 @@ FluScrollablePage{
         loadData(1,10)
     }
 
-
     FluTableView{
         id:table_view
         Layout.fillWidth: true
         Layout.topMargin: 20
-        width:parent.width
         pageCurrent:1
         pageCount:10
         itemCount: 1000
@@ -102,9 +100,61 @@ FluScrollablePage{
                                 action:com_action
                             })
         }
-
         table_view.dataSource = dataSource
     }
 
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: 10
+        code:'FluTableView{
+    id:table_view
+    Layout.fillWidth: true
+    Layout.topMargin: 20
+    width:parent.width
+    pageCurrent:1
+    pageCount:10
+    itemCount: 1000
+    onRequestPage:
+            (page,count)=> {
+                loadData(page,count)
+            }
+    Component.onCompleted: {
+        const columns = [
+                          {
+                              title: "姓名",
+                              dataIndex: "name",
+                              width:100
+                          },
+                          {
+                              title: "年龄",
+                              dataIndex: "age",
+                              width:100
+                          },
+                          {
+                              title: "住址",
+                              dataIndex: "address",
+                              width:200
+                          },
+                          {
+                              title: "别名",
+                              dataIndex: "nickname",
+                              width:100
+                          }
+                      ];
+            table_view.columns = columns
+        const dataSource = [
+                          {
+                              name: "孙悟空”,
+                              age: 500,
+                              address:"钟灵毓秀的花果山,如神仙仙境的水帘洞",
+                    nickname:"齐天大圣"
+                          }
+                      ];
+        table_view.dataSource = columns
+    }
+}'
+    }
+
+
 
 }

example/component/CodeExpander.qml

@@ -113,7 +113,12 @@ FluExpander{
           "FluTooltip",
           "FluTreeView",
           "FluWindow",
-          "FluWindowResize"
+          "FluWindowResize",
+          "FluToggleButton",
+          "FluTableView",
+          "FluColors",
+          "FluTheme",
+          "FluStatusView"
       ];
       code = code.replace(/\n/g, "<br>");
       code = code.replace(/ /g, "&nbsp;");

example/global/ItemsOriginal.qml

@@ -118,6 +118,12 @@ FluObject{
                 navigationView.push("qrc:/T_Rectangle.qml")
             }
         }
+        FluPaneItem{
+            title:"StatusView"
+            onTap:{
+                navigationView.push("qrc:/T_StatusView.qml")
+            }
+        }
         FluPaneItem{
             title:"Carousel"
             onTap:{

example/page/AboutPage.qml

@@ -36,7 +36,7 @@ FluWindow {
                 fontStyle: FluText.Title
             }
             FluText{
-                text:"v1.2.1"
+                text:"v1.2.2"
                 fontStyle: FluText.Body
                 Layout.alignment: Qt.AlignBottom
             }

example/qml.qrc

@@ -157,5 +157,6 @@
         <file>T_Pivot.qml</file>
         <file>component/CodeExpander.qml</file>
         <file>T_TableView.qml</file>
+        <file>T_StatusView.qml</file>
     </qresource>
 </RCC>

src/CMakeLists.txt

@@ -10,6 +10,10 @@ set(QT_INSTALL_QML ${Qt6Core_DIR}/../../../qml)
 set(TARGET_TYPE SHARED)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/FluentUI)
 
+if(WIN32)
+	set(CMAKE_SHARED_LIBRARY_PREFIX "")
+endif()
+
 set(TARGET_RESOURCES res.qrc)
 set(TARGET_SOURCES
     Def.cpp

src/Fluent.cpp

@@ -33,6 +33,8 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType<WindowHelper>(uri,major,minor,"WindowHelper");
     qmlRegisterType<FluColorSet>(uri,major,minor,"FluColorSet");
 
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluStatusView.qml"),uri,major,minor,"FluStatusView");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPagination.qml"),uri,major,minor,"FluPagination");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluToggleButton.qml"),uri,major,minor,"FluToggleButton");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTableView.qml"),uri,major,minor,"FluTableView");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPivotItem.qml"),uri,major,minor,"FluPivotItem");

src/controls/FluFilledButton.qml

@@ -48,6 +48,5 @@ FluControl {
                 return Qt.rgba(1,1,1,1)
             }
         }
-        font.pixelSize: 14
     }
 }

src/controls/FluPagination.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import QtQuick.Controls
 import FluentUI
 import QtQuick.Layouts
 
@@ -7,6 +8,8 @@ Item {
 
 
     signal requestPage(int page,int count)
+    property string previousText: "<上一页"
+    property string nextText: "下一页>"
     property int pageCurrent: 0
     property int itemCount: 0
     property int pageCount: itemCount>0?Math.ceil(itemCount/__itemPerPage):0
@@ -28,7 +31,7 @@ Item {
         FluToggleButton{
             visible: control.pageCount>1
             disabled: control.pageCurrent<=1
-            text:"<上一页"
+            text:control.previousText
             onClicked: {
                 control.calcNewPage(control.pageCurrent-1);
             }
@@ -76,8 +79,7 @@ Item {
             }
             FluToggleButton{
                 property int pageNumber:control.pageCount
-                visible: control.pageCount>0
-                enabled: control.pageCurrent>1
+                visible: control.pageCount>1
                 selected: pageNumber === control.pageCurrent
                 text:String(pageNumber)
                 onClicked: {
@@ -88,7 +90,7 @@ Item {
         FluToggleButton{
             visible: control.pageCount>1
             disabled: control.pageCurrent>=control.pageCount
-            text:"下一页>"
+            text:control.nextText
             onClicked: {
                 control.calcNewPage(control.pageCurrent+1);
             }

src/controls/FluRectangle.qml

@@ -9,14 +9,6 @@ Item{
     property bool shadow: true
     default property alias contentItem: container.data
 
-    Rectangle{
-        id:container
-        width: control.width
-        height: control.height
-        opacity: 0
-        color:control.color
-    }
-
     FluShadow{
         anchors.fill: container
         radius: control.radius[0]
@@ -28,6 +20,14 @@ Item{
         }
     }
 
+    Rectangle{
+        id:container
+        width: control.width
+        height: control.height
+        opacity: 0
+        color:control.color
+    }
+
     Canvas {
         id: canvas
         anchors.fill: parent

src/controls/FluStatusView.qml

@@ -0,0 +1,108 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+Item{
+
+    enum StatusMode  {
+        Loading,
+        Empty,
+        Error,
+        Success
+    }
+    default property alias content: container.data
+    property int statusMode: FluStatusView.Loading
+    signal errorClicked
+
+    Item{
+        id:container
+        anchors.fill: parent
+        visible: statusMode === FluStatusView.Success
+    }
+
+    FluArea{
+        paddings: 0
+        border.width: 0
+        anchors.fill: container
+        visible: opacity
+        opacity: statusMode === FluStatusView.Loading
+        Behavior on opacity {
+            NumberAnimation  { duration: 150 }
+        }
+        ColumnLayout{
+            anchors.centerIn: parent
+            visible: statusMode === FluStatusView.Loading
+            FluProgressRing{
+                indeterminate: true
+                Layout.alignment: Qt.AlignHCenter
+            }
+            FluText{
+                text:"正在加载..."
+                Layout.alignment: Qt.AlignHCenter
+            }
+        }
+    }
+
+    FluArea{
+        paddings: 0
+        border.width: 0
+        anchors.fill: container
+        visible: opacity
+        opacity: statusMode === FluStatusView.Empty
+        Behavior on opacity {
+            NumberAnimation  { duration: 150 }
+        }
+        ColumnLayout{
+            anchors.centerIn: parent
+            visible: statusMode === FluStatusView.Empty
+            FluText{
+                text:"空空如也"
+                fontStyle: FluText.BodyStrong
+                Layout.alignment: Qt.AlignHCenter
+            }
+        }
+    }
+
+    FluArea{
+        paddings: 0
+        border.width: 0
+        anchors.fill: container
+        visible: opacity
+        opacity: statusMode === FluStatusView.Error
+        Behavior on opacity {
+            NumberAnimation  { duration: 150 }
+        }
+        ColumnLayout{
+            anchors.centerIn: parent
+            FluText{
+                text:"页面出错了..."
+                fontStyle: FluText.BodyStrong
+                Layout.alignment: Qt.AlignHCenter
+            }
+            FluFilledButton{
+                id:btn_error
+                Layout.alignment: Qt.AlignHCenter
+                text:"重新加载"
+                onClicked:{
+                    errorClicked.call()
+                }
+            }
+        }
+    }
+
+
+    function showSuccessView(){
+        statusMode = FluStatusView.Success
+    }
+    function showLoadingView(){
+        statusMode = FluStatusView.Loading
+    }
+    function showEmptyView(){
+        statusMode = FluStatusView.Empty
+    }
+    function showErrorView(){
+        statusMode = FluStatusView.Error
+    }
+
+}

src/controls/FluTextButton.qml

@@ -6,7 +6,8 @@ FluControl {
 
     property bool disabled: false
     property color normalColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
-    property color hoverColor: FluTheme.dark ? Qt.darker(normalColor,1.3) : Qt.lighter(normalColor,1.3)
+    property color hoverColor: FluTheme.dark ? Qt.darker(normalColor,1.15) : Qt.lighter(normalColor,1.15)
+    property color pressedColor: FluTheme.dark ? Qt.darker(normalColor,1.3) : Qt.lighter(normalColor,1.3)
     property color disableColor: FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
     property bool textBold: true
 
@@ -36,6 +37,9 @@ FluControl {
                 if(disabled){
                     return disableColor
                 }
+                if(pressed){
+                    return pressedColor
+                }
                 return hovered ? hoverColor :normalColor
             }
         }

src/controls/FluToggleButton.qml

@@ -96,6 +96,5 @@ FluControl {
                 }
             }
         }
-        font.pixelSize: 14
     }
 }

src/res.qrc

@@ -70,5 +70,6 @@
         <file>controls/FluTableView.qml</file>
         <file>controls/FluPagination.qml</file>
         <file>controls/FluToggleButton.qml</file>
+        <file>controls/FluStatusView.qml</file>
     </qresource>
 </RCC>