From ddc67c9f65fb13915d957259df21c9e238d4f329 Mon Sep 17 00:00:00 2001 From: shmily744 <1527550984@qq.com> Date: Fri, 7 Jul 2023 00:56:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E6=88=90tag=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AicsKnowledgeBase/qml/component/Tag.qml | 49 +++++-- AicsKnowledgeBase/qml/page/SearchPage.qml | 153 ++++++++++++++-------- 2 files changed, 131 insertions(+), 71 deletions(-) diff --git a/AicsKnowledgeBase/qml/component/Tag.qml b/AicsKnowledgeBase/qml/component/Tag.qml index 47cb448..5a609ab 100644 --- a/AicsKnowledgeBase/qml/component/Tag.qml +++ b/AicsKnowledgeBase/qml/component/Tag.qml @@ -4,6 +4,8 @@ import QtQuick.Window import QtQuick.Controls import QtQuick.Controls.Basic import FluentUI +import QtQml +import "qrc:///AicsKnowledgeBase/qml/global" Rectangle { id: input @@ -13,10 +15,32 @@ Rectangle { radius: 5 clip: true - border.color: textInput.activeFocus ? "#268CDC":"#979592" //gray100 + ListModel { id: tagListModel } property ListModel tagList: tagListModel + property var tagMap:[] + property var presetsTags:[] + property var presetsTagsItem:[] + Component.onCompleted: { + Request.get("tag?name", + function(result, data){ +// console.log("success") +// console.log(result) +// console.log(data.length) + for(var i =0;i Date: Fri, 7 Jul 2023 01:05:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=A8=8B=E5=BA=8F=E6=89=93=E5=BC=80=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AicsKnowledgeBase/CMakeLists.txt | 2 +- AicsKnowledgeBase/src/FileTransferManager.cpp | 6 ++++++ AicsKnowledgeBase/src/FileTransferManager.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/AicsKnowledgeBase/CMakeLists.txt b/AicsKnowledgeBase/CMakeLists.txt index d0c1ff4..69e1ce2 100644 --- a/AicsKnowledgeBase/CMakeLists.txt +++ b/AicsKnowledgeBase/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD 20) -find_package(Qt6 COMPONENTS Quick WebEngineQuick REQUIRED) +find_package(Qt6 COMPONENTS Gui Quick WebEngineQuick REQUIRED) #遍历所有Cpp文件 file(GLOB_RECURSE CPP_FILES src/*.cpp src/*.h) diff --git a/AicsKnowledgeBase/src/FileTransferManager.cpp b/AicsKnowledgeBase/src/FileTransferManager.cpp index df0d6ca..b34b871 100644 --- a/AicsKnowledgeBase/src/FileTransferManager.cpp +++ b/AicsKnowledgeBase/src/FileTransferManager.cpp @@ -8,6 +8,7 @@ #include #include #include +#include static const std::string baseUrl = "https://api.hammer-hfut.tk:233/aics/file/"; //static const std::string baseUrl = "http://127.0.0.1:4523/m1/2914957-0-6e5f2db1/"; @@ -426,3 +427,8 @@ void FileTransferManager::getMarkdown(const QString &fileId) }); } +void FileTransferManager::openLocalFile(const QString &fileName) +{ + QDesktopServices::openUrl(QUrl::fromLocalFile("D:\\Downloads\\"+ fileName)); +} + diff --git a/AicsKnowledgeBase/src/FileTransferManager.h b/AicsKnowledgeBase/src/FileTransferManager.h index 571e693..3b73e4b 100644 --- a/AicsKnowledgeBase/src/FileTransferManager.h +++ b/AicsKnowledgeBase/src/FileTransferManager.h @@ -32,6 +32,8 @@ public: Q_INVOKABLE void getMarkdown(const QString &fileId); + Q_INVOKABLE void openLocalFile(const QString &fileName); + signals: void transferComplete(bool download, QString fileId, QString fileName); void markdownData(QString data);