Merge branch 'main' of http://101.34.228.45:3000/auto/AicsKnowledgeBase_client

# Conflicts:
#	AicsKnowledgeBase/qml/page/SearchPage.qml

AicsKnowledgeBase/qml/MainWindow.qml

@@ -102,6 +102,7 @@ FluWindow {
             target: SignalFileOperation
             function onOpen(file) {
                 stack_view.clear()
+                UserData.viewHistory.push(file)
                 stack_view.push(file_view, {
                                     "knowledgeFileId": file
                                 })

AicsKnowledgeBase/qml/component/FileListItem.qml

@@ -37,12 +37,15 @@ FluArea {
                 message: fileItem.title
                 onPositiveClicked: text => {
                                        var param = {
-                                           "name": text,
+                                           "parentId": fileItem.fuuid,
-                                           "parentId": fuuid
+                                           "name": text
                                        }
-                                       Request.post("/knowledge",
+                                       console.log(JSON.stringify(param))
-                                                    JSON.stringify(param))
+                                       Request.put(
+                                           "/knowledge/" + fileItem.uuid,
+                                           JSON.stringify(param), () => {
                                                refresh()
+                                           })
                                    }
             }
         }
@@ -63,6 +66,7 @@ FluArea {
                                            "parentId": uuid,
                                            "name": fileItem.title
                                        }
+                                       console.log(JSON.stringify(param))
                                        Request.put(
                                            "/knowledge/" + fileItem.uuid,
                                            JSON.stringify(param), () => {
@@ -114,6 +118,7 @@ FluArea {
                     font.bold: true
                     font.pointSize: 12
                     text: fileItem.title
+                    textFormat: Text.RichText
                 }
             }
 

AicsKnowledgeBase/qml/component/TransferListPopup.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 import FluentUI
 import AicsKB.FileTransferManager
+import "qrc:///AicsKnowledgeBase/qml/global"
 
 Popup {
     id: transfer_popup
@@ -18,6 +19,15 @@ Popup {
         FluShadow {}
     }
 
+    Connections {
+        target: FileTransferManager
+        onTransferComplete: (download, fileId, fileName) => {
+                                console.log("onTransferComplete")
+                                UserData.downloadedFiles.push(fileId)
+                                console.log(UserData.downloadedFiles)
+                            }
+    }
+
     contentItem: FluScrollablePage {
         anchors.fill: parent
         anchors.topMargin: 10
@@ -30,21 +40,41 @@ Popup {
                     Layout.fillWidth: true
                     height: 50
 
-                    ColumnLayout {
+                    Item {
                         anchors.fill: parent
-                        anchors.margins: 5
+                        anchors.topMargin: 5
+                        anchors.bottomMargin: 5
+                        anchors.leftMargin: 0
+                        Image {
+                            id: icon
+                            anchors.verticalCenter: parent.verticalCenter
+                            width: 32
+                            height: 32
+                            source: download ? "qrc:/AicsKnowledgeBase/res/download.png" : "qrc:/AicsKnowledgeBase/res/upload.png"
+                        }
+
+                        ColumnLayout {
+                            anchors.left: icon.right
+                            anchors.right: parent.right
+                            anchors.leftMargin: 5
                             spacing: 2
                             Text {
                                 text: name
                             }
-
+                            Text {
+                                visible: completedSize >= totalSize
+                                text: "已完成"
+                                color: FluColors.Grey130
+                            }
                             FluProgressBar {
                                 Layout.fillWidth: true
                                 progress: completedSize / totalSize
                                 indeterminate: false
+                                visible: completedSize < totalSize
                             }
 
                             Text {
+                                visible: completedSize < totalSize
                                 color: FluColors.Grey130
                                 text: formatSize(speed) + "/s - " + formatSize(
                                           completedSize) + "/" + formatSize(
@@ -60,8 +90,10 @@ Popup {
                                  */
                                 function formatSize(size, pointLength, units) {
                                     var unit
-                                units = units || ['B', 'KB', 'MB', 'GB', 'TB']
+                                    units = units
-                                while ((unit = units.shift()) && size > 1024) {
+                                            || ['B', 'KB', 'MB', 'GB', 'TB']
+                                    while ((unit = units.shift())
+                                           && size > 1024) {
                                         size = size / 1024
                                     }
                                     return (unit === 'B' ? size : size.toFixed(
@@ -69,11 +101,15 @@ Popup {
                                 }
                             }
                         }
+                    }
 
                     MouseArea {
                         anchors.fill: parent
                         hoverEnabled: true
-                        onEntered: file_buttons.visible = true
+                        onEntered: {
+                            if (completedSize < totalSize)
+                                file_buttons.visible = true
+                        }
                         onExited: file_buttons.visible = false
 
                         LinearGradient {

AicsKnowledgeBase/qml/global/UserData.qml

@@ -5,4 +5,6 @@ import QtQuick
 QtObject {
     property string username
     property string userId
+    property var viewHistory: []
+    property var downloadedFiles: []
 }

AicsKnowledgeBase/qml/page/AudioPage.qml

@@ -4,18 +4,91 @@ import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Controls.Basic
 import FluentUI
+import "qrc:///AicsKnowledgeBase/qml/component"
+import "qrc:///AicsKnowledgeBase/qml/global"
 
 FluArea {
     property string url: ''
     backgroundColor: "#f9f9f9"
-
     Layout.fillWidth: true
     Layout.fillHeight: true
     paddings: 10
     Layout.topMargin: 20
 
     FluText {
+        id: title
         Layout.topMargin: 20
         text: "Audio"
     }
+    FileList {
+        anchors.top: title.bottom
+        disableHeader: true
+        width: parent.width
+        dataModel: listModel
+    }
+    ListModel {
+        id: listModel
+    }
+    Component.onCompleted: {
+        Request.get("/knowledge?type=AUDIO", response => {
+                        var files = JSON.parse(response)
+                        listModel.clear()
+                        for (var i = 0; i < files.length; i++) {
+                            var file = files[i]
+                            console.log(file.name)
+                            var modelItem = {
+                                "title": file.name,
+                                "uuid": file.id,
+                                "date"// cut time after 'T'
+                                : file.createTime.substring(0, 10),
+                                "fuuid": "0"
+                            }
+                            if (file.knowledgeFileAttribute === null) {
+                                modelItem.type = "folder"
+                                modelItem.isDir = true
+                                modelItem.size = 0
+                            } else {
+                                modelItem.isDir = false
+                                modelItem.type = getType(
+                                    file.knowledgeFileAttribute.suffix)
+                                modelItem.size = file.knowledgeFileAttribute.size
+                                modelItem.brief = file.knowledgeFileAttribute.brief
+                                modelItem.pageView = file.knowledgeFileAttribute.pageView
+                                modelItem.stars = 0
+                                var tagString = ""
+                                for (var j = 0; j < file.knowledgeFileAttribute.tags.length; j++) {
+                                    if (j != 0)
+                                    tagString = tagString + ","
+                                    tagString = tagString + file.knowledgeFileAttribute.tags[j].name
+                                }
+                                modelItem.tags = tagString
+                            }
+                            listModel.append(modelItem)
+                        }
+                    })
+    }
+    function getType(suffix) {
+        if (suffix === "ppt" || suffix === "pptx")
+            return "PPT"
+        else if (suffix === "doc" || suffix === "docx")
+            return "WORD"
+        else if (suffix === "pdf")
+            return "PDF"
+        else if (suffix === "txt")
+            return "TXT"
+        else if (suffix === "xls" || suffix === "xlsx")
+            return "EXCEL"
+        else if (suffix === "zip" || suffix === "rar")
+            return "ZIP"
+        else if (suffix === "png" || suffix === "jpg" || suffix === "jpeg"
+                 || suffix === "gif")
+            return "IMAGE"
+        else if (suffix === "mp3" || suffix === "wav")
+            return "AUDIO"
+        else if (suffix === "mp4" || suffix === "avi" || suffix === "rmvb"
+                 || suffix === "rm" || suffix === "wmv" || suffix === "mkv")
+            return "VIDEO"
+        else
+            return "OTHER"
+    }
 }

AicsKnowledgeBase/qml/page/DocumentPage.qml

@@ -4,6 +4,8 @@ import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Controls.Basic
 import FluentUI
+import "qrc:///AicsKnowledgeBase/qml/component"
+import "qrc:///AicsKnowledgeBase/qml/global"
 
 FluArea {
     property string url: ''
@@ -14,7 +16,79 @@ FluArea {
     Layout.topMargin: 20
 
     FluText {
+        id: title
         Layout.topMargin: 20
         text: "Document"
     }
+    FileList {
+        anchors.top: title.bottom
+        disableHeader: true
+        width: parent.width
+        dataModel: listModel
+    }
+    ListModel {
+        id: listModel
+    }
+    Component.onCompleted: {
+        Request.get("/knowledge?type=DOCUMENT", response => {
+                        var files = JSON.parse(response)
+                        listModel.clear()
+                        for (var i = 0; i < files.length; i++) {
+                            var file = files[i]
+                            console.log(file.name)
+                            var modelItem = {
+                                "title": file.name,
+                                "uuid": file.id,
+                                "date"// cut time after 'T'
+                                : file.createTime.substring(0, 10),
+                                "fuuid": "0"
+                            }
+                            if (file.knowledgeFileAttribute === null) {
+                                modelItem.type = "folder"
+                                modelItem.isDir = true
+                                modelItem.size = 0
+                            } else {
+                                modelItem.isDir = false
+                                modelItem.type = getType(
+                                    file.knowledgeFileAttribute.suffix)
+                                modelItem.size = file.knowledgeFileAttribute.size
+                                modelItem.brief = file.knowledgeFileAttribute.brief
+                                modelItem.pageView = file.knowledgeFileAttribute.pageView
+                                modelItem.stars = 0
+                                var tagString = ""
+                                for (var j = 0; j < file.knowledgeFileAttribute.tags.length; j++) {
+                                    if (j != 0)
+                                    tagString = tagString + ","
+                                    tagString = tagString + file.knowledgeFileAttribute.tags[j].name
+                                }
+                                modelItem.tags = tagString
+                            }
+                            listModel.append(modelItem)
+                        }
+                    })
+    }
+    function getType(suffix) {
+        if (suffix === "ppt" || suffix === "pptx")
+            return "PPT"
+        else if (suffix === "doc" || suffix === "docx")
+            return "WORD"
+        else if (suffix === "pdf")
+            return "PDF"
+        else if (suffix === "txt")
+            return "TXT"
+        else if (suffix === "xls" || suffix === "xlsx")
+            return "EXCEL"
+        else if (suffix === "zip" || suffix === "rar")
+            return "ZIP"
+        else if (suffix === "png" || suffix === "jpg" || suffix === "jpeg"
+                 || suffix === "gif")
+            return "IMAGE"
+        else if (suffix === "mp3" || suffix === "wav")
+            return "AUDIO"
+        else if (suffix === "mp4" || suffix === "avi" || suffix === "rmvb"
+                 || suffix === "rm" || suffix === "wmv" || suffix === "mkv")
+            return "VIDEO"
+        else
+            return "OTHER"
+    }
 }

AicsKnowledgeBase/qml/page/HistoryPage.qml

@@ -4,6 +4,8 @@ import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Controls.Basic
 import FluentUI
+import "qrc:///AicsKnowledgeBase/qml/component"
+import "qrc:///AicsKnowledgeBase/qml/global"
 
 FluArea {
     property string url: ''
@@ -17,4 +19,75 @@ FluArea {
         Layout.topMargin: 20
         text: "History"
     }
+    FileList {
+        anchors.top: title.bottom
+        disableHeader: true
+        width: parent.width
+        dataModel: listModel
+    }
+    ListModel {
+        id: listModel
+    }
+    Component.onCompleted: {
+        listModel.clear()
+        for (var i = 0; i < history.length; i++) {
+            Request.get("/knowledge/" + history[i] + "/detailed", response => {
+                            var file = JSON.parse(response)
+
+                            var modelItem = {
+                                "title": file.name,
+                                "uuid": file.id,
+                                "date"// cut time after 'T'
+                                : file.createTime.substring(0, 10),
+                                "fuuid": ""
+                            }
+                            if (file.knowledgeFileAttribute === null) {
+                                modelItem.type = "folder"
+                                modelItem.isDir = true
+                                modelItem.size = 0
+                            } else {
+                                modelItem.isDir = false
+                                modelItem.type = getType(
+                                    file.knowledgeFileAttribute.suffix)
+                                modelItem.size = file.knowledgeFileAttribute.size
+                                modelItem.brief = file.knowledgeFileAttribute.brief
+                                modelItem.pageView = file.knowledgeFileAttribute.pageView
+                                modelItem.stars = 0
+                                // merge file.knowledgeFileAttribute.tags array to a string
+                                var tagString = ""
+                                for (var j = 0; j < file.knowledgeFileAttribute.tags.length; j++) {
+                                    if (j != 0)
+                                    tagString = tagString + ","
+                                    tagString = tagString + file.knowledgeFileAttribute.tags[j].name
+                                }
+                                modelItem.tags = tagString
+                            }
+                            listModel.append(modelItem)
+                        })
+        }
+    }
+    function getType(suffix) {
+        if (suffix === "ppt" || suffix === "pptx")
+            return "PPT"
+        else if (suffix === "doc" || suffix === "docx")
+            return "WORD"
+        else if (suffix === "pdf")
+            return "PDF"
+        else if (suffix === "txt")
+            return "TXT"
+        else if (suffix === "xls" || suffix === "xlsx")
+            return "EXCEL"
+        else if (suffix === "zip" || suffix === "rar")
+            return "ZIP"
+        else if (suffix === "png" || suffix === "jpg" || suffix === "jpeg"
+                 || suffix === "gif")
+            return "IMAGE"
+        else if (suffix === "mp3" || suffix === "wav")
+            return "AUDIO"
+        else if (suffix === "mp4" || suffix === "avi" || suffix === "rmvb"
+                 || suffix === "rm" || suffix === "wmv" || suffix === "mkv")
+            return "VIDEO"
+        else
+            return "OTHER"
+    }
 }

AicsKnowledgeBase/qml/page/NotePage.qml

@@ -46,7 +46,6 @@ FluArea {
         property list<string> tags: ["tag 1", "tag 2", "tag 3"]
         property string publishTime: "2020-01-01"
         property string brief: "这是一个简介"
-        property var fromFile
 
         function getType(suffix) {
             if (suffix === "md")
@@ -63,29 +62,7 @@ FluArea {
         }
 
         Component.onCompleted: {
-            Request.get("knowledge/", function (response, data) {
-                fromFile = {
-                    "uuid": data.id,
-                    "fuuid": data.knowledgeFileAttribute.id,
-                    "title": data.name,
-                    "date": data.createTime,
-                    "brief": data.knowledgeFileAttribute.brief,
-                    "suffix": data.knowledgeFileAttribute.suffix,
-                    "type": getType(data.knowledgeFileAttribute.suffix),
-                    "pageView": data.knowledgeFileAttribute.pageView,
-                    "size": data.knowledgeFileAttribute.size
-                }
 
-                fromFile.stars = 0
-
-                var tagString = ""
-                for (var j = 0; j < file.knowledgeFileAttribute.tags.length; j++) {
-                    if (j != 0)
-                        tagString = tagString + ","
-                    tagString = tagString + file.knowledgeFileAttribute.tags[j].name
-                }
-                fromFile.tags = tagString
-            })
         }
 
         FluIconButton {
@@ -222,19 +199,5 @@ FluArea {
             width: parent.width
             implicitHeight: 400
         }
-        //        FistListItem {
-        //            id: fileListItem
-        //            uuid: fromFile.uuid
-        //            fuuid: fromFile.fuuid
-        //            title: fromFile.title
-        //            date: fromFile.date
-        //            brief: fromFile.brief
-        //            type: fromFile.type
-        //            pageView: fromFile.pageView
-        //            size: fromFile.size
-        //            stars: fromFile.stars
-        //            tags: fromFile.tags === null || fromFile.tags === undefined
-        //                  || fromFile.tags === "" ? [] : fromFile.tags.split(",")
-        //        }
     }
 }

AicsKnowledgeBase/qml/page/SearchPage.qml

@@ -21,6 +21,7 @@ FluArea {
     //        text: "Search"
     //    }
 
+
     /*
        按标题，内容搜索
     */

AicsKnowledgeBase/qml/page/VideoPage.qml

@@ -4,6 +4,8 @@ import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Controls.Basic
 import FluentUI
+import "qrc:///AicsKnowledgeBase/qml/component"
+import "qrc:///AicsKnowledgeBase/qml/global"
 
 FluArea {
     property string url: ''
@@ -14,7 +16,79 @@ FluArea {
     Layout.topMargin: 20
 
     FluText {
+        id: title
         Layout.topMargin: 20
         text: "Video"
     }
+    FileList {
+        anchors.top: title.bottom
+        disableHeader: true
+        width: parent.width
+        dataModel: listModel
+    }
+    ListModel {
+        id: listModel
+    }
+    Component.onCompleted: {
+        Request.get("/knowledge?type=VIDEO", response => {
+                        var files = JSON.parse(response)
+                        listModel.clear()
+                        for (var i = 0; i < files.length; i++) {
+                            var file = files[i]
+                            console.log(file.name)
+                            var modelItem = {
+                                "title": file.name,
+                                "uuid": file.id,
+                                "date"// cut time after 'T'
+                                : file.createTime.substring(0, 10),
+                                "fuuid": "0"
+                            }
+                            if (file.knowledgeFileAttribute === null) {
+                                modelItem.type = "folder"
+                                modelItem.isDir = true
+                                modelItem.size = 0
+                            } else {
+                                modelItem.isDir = false
+                                modelItem.type = getType(
+                                    file.knowledgeFileAttribute.suffix)
+                                modelItem.size = file.knowledgeFileAttribute.size
+                                modelItem.brief = file.knowledgeFileAttribute.brief
+                                modelItem.pageView = file.knowledgeFileAttribute.pageView
+                                modelItem.stars = 0
+                                var tagString = ""
+                                for (var j = 0; j < file.knowledgeFileAttribute.tags.length; j++) {
+                                    if (j != 0)
+                                    tagString = tagString + ","
+                                    tagString = tagString + file.knowledgeFileAttribute.tags[j].name
+                                }
+                                modelItem.tags = tagString
+                            }
+                            listModel.append(modelItem)
+                        }
+                    })
+    }
+    function getType(suffix) {
+        if (suffix === "ppt" || suffix === "pptx")
+            return "PPT"
+        else if (suffix === "doc" || suffix === "docx")
+            return "WORD"
+        else if (suffix === "pdf")
+            return "PDF"
+        else if (suffix === "txt")
+            return "TXT"
+        else if (suffix === "xls" || suffix === "xlsx")
+            return "EXCEL"
+        else if (suffix === "zip" || suffix === "rar")
+            return "ZIP"
+        else if (suffix === "png" || suffix === "jpg" || suffix === "jpeg"
+                 || suffix === "gif")
+            return "IMAGE"
+        else if (suffix === "mp3" || suffix === "wav")
+            return "AUDIO"
+        else if (suffix === "mp4" || suffix === "avi" || suffix === "rmvb"
+                 || suffix === "rm" || suffix === "wmv" || suffix === "mkv")
+            return "VIDEO"
+        else
+            return "OTHER"
+    }
 }

AicsKnowledgeBase/src/FileTransferListModel.cpp

@@ -10,6 +10,8 @@ FileTransferListModel::FileTransferListModel(QObject *parent)
 	m_roleName.insert(kTotalSizeRole, "totalSize");
 	m_roleName.insert(kSpeedRole, "speed");
 	m_roleName.insert(kPausedRole, "paused");
+
+	m_data.append({true, "id", "name", 30, 100, 30});
 }
 
 

AicsKnowledgeBase/src/FileTransferManager.cpp

@@ -73,8 +73,8 @@ static int xferinfo(void *p, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ul
 	fileTrans->completedSize += dlnow;
 
 	fileTrans->speed = speed;
-	qDebug() << std::format("Downloading: {} / {}, Speed: {}", fileTrans->completedSize, fileTrans->totalSize,
+	//qDebug() << std::format("Downloading: {} / {}, Speed: {}", fileTrans->completedSize, fileTrans->totalSize,
-							speed).c_str();
+	//						speed).c_str();
 
 	auto item = static_cast<FileItem>(*fileTrans);
 	QTimer::singleShot(0, qApp, [item]() {
@@ -96,8 +96,8 @@ static int uploadInfo(void *p, curl_off_t dltotal, curl_off_t dlnow, curl_off_t
 	curl_easy_getinfo(fileTrans->curlHandle, CURLINFO_SPEED_UPLOAD_T, &speed);
 	fileTrans->completedSize += ulnow;
 	fileTrans->speed = speed;
-	qDebug() << std::format("Uploading: {} / {}, Speed: {}", fileTrans->completedSize, fileTrans->totalSize,
+	//qDebug() << std::format("Uploading: {} / {}, Speed: {}", fileTrans->completedSize, fileTrans->totalSize,
-							speed).c_str();
+	//						speed).c_str();
 
 	auto item = static_cast<FileItem>(*fileTrans);
 	QTimer::singleShot(0, qApp, [item]() {
@@ -359,6 +359,10 @@ void FileTransferManager::download(const QString &fileId, const QString &fileNam
 
 		auto fileUrl = std::format("File/{}?rangeStart={}&rangeEnd={}", fileId.toStdString(), completedSize, size);
 		auto res = httpDownload(fileUrl, savePath, item);
+
+		if (QFileInfo(QString::fromLocal8Bit(savePath.c_str())).size() == size)
+				emit transferComplete(true, fileId, fileName);
+
 		qDebug() << "End Get" << res;
 	});
 }
@@ -398,8 +402,6 @@ QString FileTransferManager::getFileName(const QUrl &fileUrl)
 }
 
 
-
-
 void FileTransferManager::getMarkdown(const QString &fileId)
 {
 	QtConcurrent::run([fileId, this] {

AicsKnowledgeBase/src/FileTransferManager.h

@@ -33,6 +33,7 @@ public:
 	Q_INVOKABLE void getMarkdown(const QString &fileId);
 
 signals:
+	void transferComplete(bool download, QString fileId, QString fileName);
 	void markdownData(QString data);
 private: