diff --git a/AicsKnowledgeBase/qml/page/ContentPage.qml b/AicsKnowledgeBase/qml/page/ContentPage.qml index f2f06b2..220c1a5 100644 --- a/AicsKnowledgeBase/qml/page/ContentPage.qml +++ b/AicsKnowledgeBase/qml/page/ContentPage.qml @@ -47,7 +47,6 @@ FluArea { signal download(string knowledgeFileId) signal clickTags(string tagName) - // paddings: { // top: 10 // right: 0 @@ -94,7 +93,9 @@ FluArea { content_page.title = data.name content_page.fileId = data.knowledgeFileAttribute.id - content_area.type = data.knowledgeFileAttribute.suffix + content_area.type = getType( + data.knowledgeFileAttribute.suffix) + console.log(content_area.type) var tagString = "" for (var j = 0; j < data.knowledgeFileAttribute.tags.length; j++) { @@ -112,9 +113,11 @@ FluArea { // } // content_page.favoriteCount = starers.length - if (content_area.type === "MD") { - FileTransferManager.getMarkdown(content_page.fileId) - } else if (content_area.type === "VIDEO") { + if (content_area.type == "MD") { + console.log(content_area.type) + FileTransferManager.getMarkdown( + content_page.fileId) + } else if (content_area.type == "VIDEO") { } else { Request.get("knowledge/" + knowledgeFileId + "/preview/external", @@ -130,11 +133,13 @@ FluArea { Connections { target: FileTransferManager onMarkdownData: data => { - content_view.push(text_view, {contentMd: data}) + console.log(data) + content_view.push(text_view, { + "contentMd": data + }) } } - Component.onCompleted: { loadFile(knowledgeFileId) console.log(content_area.type) @@ -234,7 +239,6 @@ FluArea { FileTransferManager.download(content_page.fileId, content_page.title) } - } } @@ -296,7 +300,7 @@ FluArea { StackView { id: content_view Layout.fillWidth: true - height: width*10/16 + height: 500 } Component { @@ -311,15 +315,16 @@ FluArea { NoteEditPage { noteId: "255454" width: parent.width - height: width*9/16 + height: width * 9 / 16 + isEditable: true } } Component { id: other_view WebEngineView { width: parent.width + height: width * 9 / 16 backgroundColor: "transparent" - implicitHeight: 200 settings.javascriptEnabled: true settings.pluginsEnabled: true url: "https://www.baidu.com" diff --git a/AicsKnowledgeBase/qml/page/CreateNotePage.qml b/AicsKnowledgeBase/qml/page/CreateNotePage.qml index 97dd75a..ba3fd62 100644 --- a/AicsKnowledgeBase/qml/page/CreateNotePage.qml +++ b/AicsKnowledgeBase/qml/page/CreateNotePage.qml @@ -19,10 +19,10 @@ FluArea { property string noteContent Component.onCompleted: { - noteTitle = Qt.binding(function() { + noteTitle = Qt.binding(function () { return input_title.text }) - noteContent = Qt.binding(function() { + noteContent = Qt.binding(function () { return input_md.contentMd }) } @@ -60,13 +60,12 @@ FluArea { FluTextBox { id: input_title padding: 10 - placeholderText:"单行输入框" + placeholderText: "单行输入框" implicitWidth: parent.width } } } - FluText { padding: 10 text: "内容" @@ -80,8 +79,9 @@ FluArea { id: input_md noteId: "255454" width: parent.width - height: width*9/16 + height: width * 9 / 16 isEditable: true + isEditing: true } RowLayout { diff --git a/AicsKnowledgeBase/qml/page/NoteEditPage.qml b/AicsKnowledgeBase/qml/page/NoteEditPage.qml index a8fecfd..5d88ceb 100644 --- a/AicsKnowledgeBase/qml/page/NoteEditPage.qml +++ b/AicsKnowledgeBase/qml/page/NoteEditPage.qml @@ -25,16 +25,33 @@ FluArea { bottomPadding: 0 Component.onCompleted: { + if (isEditing) { + button_edit.visible = false + button_save.visible = true + button_preview.visible = true + button_subfield.visible = true + button_editing.visible = true + button_cancel.visible = true + md_show_view.isEditShowing = true + md_show_view.isPreviewShowing = false + } else { + button_edit.visible = edit_area.isEditable + button_save.visible = false + button_preview.visible = false + button_subfield.visible = false + button_editing.visible = false + button_cancel.visible = false + md_show_view.isEditShowing = false + md_show_view.isPreviewShowing = true + } textArea_edit.text = edit_area.contentMd - edit_area.contentMd = Qt.binding( - function() { - return textArea_edit.text - }) - textArea_preview.text = Qt.binding( - function() { - return edit_area.contentMd - }) + edit_area.contentMd = Qt.binding(function () { + return textArea_edit.text + }) + textArea_preview.text = Qt.binding(function () { + return edit_area.contentMd + }) } Item { @@ -111,12 +128,12 @@ FluArea { FluIconButton { id: button_subfield - iconSource: md_show_view.isPreviewShowing ? FluentIcons.ClosePane: FluentIcons.OpenPane + iconSource: md_show_view.isPreviewShowing ? FluentIcons.ClosePane : FluentIcons.OpenPane iconSize: 12 text: "分栏" visible: false onClicked: { - if(md_show_view.isEditShowing ^ md_show_view.isPreviewShowing) { + if (md_show_view.isEditShowing ^ md_show_view.isPreviewShowing) { md_show_view.isEditShowing = true md_show_view.isPreviewShowing = true } else { @@ -152,7 +169,7 @@ FluArea { property bool isPreviewShowing: true Layout.fillWidth: true - implicitHeight: width * 8/16 + implicitHeight: width * 8 / 16 ScrollView { id: edit_show_view @@ -163,10 +180,10 @@ FluArea { id: textArea_edit wrapMode: TextEdit.Wrap background: Rectangle { - color: customTextArea.focus ? "#E0E0E0" : "white" - border.color: FluColors.Grey30 - radius: 10 - } + color: customTextArea.focus ? "#E0E0E0" : "white" + border.color: FluColors.Grey30 + radius: 10 + } } } @@ -180,10 +197,10 @@ FluArea { wrapMode: TextEdit.Wrap textFormat: TextEdit.MarkdownText background: Rectangle { - color: customTextArea.focus ? "#E0E0E0" : "white" - border.color: FluColors.Grey30 - radius: 10 - } + color: customTextArea.focus ? "#E0E0E0" : "white" + border.color: FluColors.Grey30 + radius: 10 + } readOnly: true MouseArea { anchors.fill: parent diff --git a/AicsKnowledgeBase/src/FileTransferManager.cpp b/AicsKnowledgeBase/src/FileTransferManager.cpp index 6a4de75..3344a42 100644 --- a/AicsKnowledgeBase/src/FileTransferManager.cpp +++ b/AicsKnowledgeBase/src/FileTransferManager.cpp @@ -418,7 +418,7 @@ void FileTransferManager::getMarkdown(const QString &fileId) auto fileUrl = std::format("File/{}?rangeStart={}&rangeEnd={}", fileId.toStdString(), 0, size); std::string fileData; auto res = httpGet(fileUrl, fileData); - //qDebug() << fileData.c_str(); + qDebug() << fileData.c_str(); emit markdownData(QString::fromStdString(fileData)); //qDebug() << "End Get" << res; });