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

AicsKnowledgeBase/qml/component/FileList.qml

@@ -126,9 +126,15 @@ Item {
                     return "OTHER"
             }
             RowLayout {
-                Layout.preferredWidth: parent.width
+                Layout.alignment: Qt.AlignRight
+                //Layout.preferredWidth: parent.width
+                layoutDirection: Qt.RightToLeft
+                UploadButton {
+                    //Layout.alignment: Qt.AlignRight
+                    header: header
+                }
                 Item {
-                    anchors.right: uploadBtn.left
+                    //anchors.right: uploadBtn.left
                     height: 28
                     width: 28
                     InputDialog {
@@ -153,20 +159,14 @@ Item {
                                            }
                     }
 
-                    Image {
-                        source: "qrc:/AicsKnowledgeBase/res/createFolder.png"
-                        anchors.fill: parent
-                    }
-                    MouseArea {
+                    FluIconButton {
                         anchors.fill: parent
+                        iconSource: FluentIcons.NewFolder
                         onClicked: {
                             dialog.open()
                         }
                     }
                 }
-                UploadButton {
-                    Layout.alignment: Qt.AlignRight
-                }
             }
             RowLayout {
                 id: fileListItemHeaderItem

AicsKnowledgeBase/qml/component/FileListItem.qml

@@ -108,6 +108,7 @@ FluArea {
                 source: type ? "qrc:/AicsKnowledgeBase/res/" + type + ".png" : ""
                 Layout.preferredHeight: 24
                 Layout.preferredWidth: 24
+                fillMode: Image.PreserveAspectFit
             }
             FluText {
                 id: title

AicsKnowledgeBase/qml/component/UploadButton.qml

@@ -10,12 +10,12 @@ FluButton {
     property var header
     property var currentSelectedFile: null
 
-    Layout.alignment: Qt.AlignRight
+    //Layout.alignment: Qt.AlignRight
     text: "上传"
     onClicked: function () {
         console.log("click")
-        //fileDialog.open()
-        popup.open()
+        fileDialog.open()
+        //popup.open()
     }
     FileDialog {
         id: fileDialog
@@ -110,14 +110,13 @@ FluButton {
                         Layout.fillHeight: true
                         text: "上传"
                         onClicked: {
+                            popup.close()
+                            var tagIds = []
                             for (var i = 0; i < tags.tagList.count; i++) {
                                 console.log(tags.tagList.get(i).tag)
                                 console.log(tags.tagList.get(i).id)
+                                tagIds.push(tags.tagList.get(i).id)
                             }
-
-                            return
-
-                            popup.close()
                             let name = FileTransferManager.getFileName(
                                     currentSelectedFile)
                             const size = FileTransferManager.getFileSize(
@@ -131,7 +130,7 @@ FluButton {
                                 "brief": brief_textbox.text,
                                 "size": size,
                                 "md5": md5,
-                                "tags": [],
+                                "tags": tagIds,
                                 "parentId": currentParentId()
                             }
                             console.log("begin")