diff --git a/AicsKnowledgeBase/qml/component/FileList.qml b/AicsKnowledgeBase/qml/component/FileList.qml index e5d4149..c2b2e0b 100644 --- a/AicsKnowledgeBase/qml/component/FileList.qml +++ b/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 diff --git a/AicsKnowledgeBase/qml/component/FileListItem.qml b/AicsKnowledgeBase/qml/component/FileListItem.qml index 862f8c6..63c43ae 100644 --- a/AicsKnowledgeBase/qml/component/FileListItem.qml +++ b/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 diff --git a/AicsKnowledgeBase/qml/component/UploadButton.qml b/AicsKnowledgeBase/qml/component/UploadButton.qml index b41c740..070882b 100644 --- a/AicsKnowledgeBase/qml/component/UploadButton.qml +++ b/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") diff --git a/AicsKnowledgeBase/res/FOLDER.png b/AicsKnowledgeBase/res/FOLDER.png index 799762c..27eda1d 100644 Binary files a/AicsKnowledgeBase/res/FOLDER.png and b/AicsKnowledgeBase/res/FOLDER.png differ diff --git a/AicsKnowledgeBase/res/MUSIC.png b/AicsKnowledgeBase/res/MUSIC.png new file mode 100644 index 0000000..592e25e Binary files /dev/null and b/AicsKnowledgeBase/res/MUSIC.png differ diff --git a/AicsKnowledgeBase/res/OTHER.png b/AicsKnowledgeBase/res/OTHER.png index 54a10d1..27ec62e 100644 Binary files a/AicsKnowledgeBase/res/OTHER.png and b/AicsKnowledgeBase/res/OTHER.png differ diff --git a/AicsKnowledgeBase/res/PDF.png b/AicsKnowledgeBase/res/PDF.png index 1505a76..eb859a0 100644 Binary files a/AicsKnowledgeBase/res/PDF.png and b/AicsKnowledgeBase/res/PDF.png differ diff --git a/AicsKnowledgeBase/res/PPT.png b/AicsKnowledgeBase/res/PPT.png index 8b0ec43..1bcb838 100644 Binary files a/AicsKnowledgeBase/res/PPT.png and b/AicsKnowledgeBase/res/PPT.png differ diff --git a/AicsKnowledgeBase/res/VIDEO.png b/AicsKnowledgeBase/res/VIDEO.png index 3d8536c..72783c6 100644 Binary files a/AicsKnowledgeBase/res/VIDEO.png and b/AicsKnowledgeBase/res/VIDEO.png differ diff --git a/AicsKnowledgeBase/res/WORD.png b/AicsKnowledgeBase/res/WORD.png index c381412..f34418d 100644 Binary files a/AicsKnowledgeBase/res/WORD.png and b/AicsKnowledgeBase/res/WORD.png differ