merge

AicsKnowledgeBase/qml/MainWindow.qml

@@ -101,9 +101,8 @@ FluWindow {
         Connections {
             target: SignalFileOperation
             function onOpen(file) {
-                stack_view.push(file_view, {
+                stack_view.clear()
-                                    "knowledgeFileId": file
+                stack_view.push(file_view, {knowledgeFileId: file})
-                                })
             }
             function onOpenNote(note) {
                 stack_view.push(note_view, {

AicsKnowledgeBase/qml/page/ContentPage.qml

@@ -131,12 +131,8 @@ FluArea {
             console.log(content_area.type)
         }
 
-        FluIconButton {
+        FluText {
-            iconSize: 12
+            font.pointSize: 12
-            iconSource: FluentIcons.Back
-            onClicked: {
-                emit: SignalFileOperation.back()
-            }
             Layout.margins: -5
         }
 

AicsKnowledgeBase/qml/page/CreateNotePage.qml

@@ -18,6 +18,12 @@ FluArea {
     property string noteTitle
     property string noteContent
 
+    Component.onCompleted: {
+        noteTitle = Qt.binding(function() {
+            return input_title.text
+        })
+    }
+
     FluScrollablePage {
         id: edit_page
         anchors.fill: parent
@@ -25,13 +31,15 @@ FluArea {
         topPadding: 5
         rightPadding: 5
         bottomPadding: 0
-        FluIconButton {
+        RowLayout {
-            iconSize: 12
+            FluIconButton {
-            iconSource: FluentIcons.Back
+                iconSize: 12
-            onClicked: {
+                iconSource: FluentIcons.Back
-                emit: SignalFileOperation.back()
+                onClicked: {
+                    emit: SignalFileOperation.back()
+                }
+                Layout.margins: -5
             }
-            Layout.margins: -5
         }
         Item {
             Layout.fillWidth: true
@@ -47,18 +55,42 @@ FluArea {
                     }
                 }
                 FluTextBox {
+                    id: input_title
                     padding: 10
                     placeholderText:"单行输入框"
                     implicitWidth: parent.width
                 }
             }
         }
-        Item {
-            Layout.fillWidth: true
-            implicitHeight: parent.height
-            Layout.fillWidth: true
-            NoteEditPage {
 
+
+        FluText {
+            padding: 10
+            text: "内容"
+            font {
+                pointSize: 15
+                bold: true
+            }
+        }
+
+        NoteEditPage {
+            id: text_view
+            noteId: "255454"
+            width: parent.width
+            height: width*9/16
+        }
+
+        RowLayout {
+            Layout.alignment: Qt.AlignCenter
+            Layout.topMargin: 10
+            FluFilledButton {
+                text: "上传"
+                onClicked: {
+                    console.log(noteTitle)
+                }
+            }
+            FluButton {
+                text: "取消"
             }
         }
     }

AicsKnowledgeBase/qml/page/NoteEditPage.qml

@@ -11,6 +11,7 @@ FluArea {
     paddings: 0
     backgroundColor: "#f9f9f9"
     property string noteId: "234"
+    Layout.fillWidth: true
 
     FluScrollablePage {
         id: edit_page
@@ -153,7 +154,7 @@ FluArea {
             property bool isPreviewShowing: true
 
             Layout.fillWidth: true
-            implicitHeight: 300
+            implicitHeight: width * 8/16
 
             ScrollView {
                 id: edit_show_view