修改Tag组件

AicsKnowledgeBase/qml/component/FileList.qml

@@ -164,47 +164,8 @@ Item {
                         }
                     }
                 }
-                FluButton {
-                    id: uploadIcon
+                UploadButton {
                     Layout.alignment: Qt.AlignRight
-                    text: "上传"
-                    onClicked: function () {
-                        console.log("click")
-                        fileDialog.open()
-                    }
-                    FileDialog {
-                        id: fileDialog
-                        onAccepted: function () {
-                            let name = FileTransferManager.getFileName(
-                                    selectedFile)
-                            const size = FileTransferManager.getFileSize(
-                                           selectedFile)
-                            const md5 = FileTransferManager.getFileMd5(
-                                          selectedFile)
-                            if (size <= 0 || md5 === '')
-                                return
-                            var body = {
-                                "name": name,
-                                "brief": "brief",
-                                "size": size,
-                                "md5": md5,
-                                "tags": [],
-                                "parentId": header.items.length !== 0 ? header.items[header.items.length - 1].uuid : null
-                            }
-                            console.log("begin")
-                            Request.post("knowledge/file",
-                                         JSON.stringify(body),
-                                         function (res, data) {
-                                             console.log(res)
-                                             console.log(data)
-                                             FileTransferManager.upload(
-                                                         selectedFile, data.id,
-                                                         data.ticket, name)
-                                         }, function (res, data) {
-                                             console.log(res)
-                                         })
-                        }
-                    }
                 }
             }
             RowLayout {

AicsKnowledgeBase/qml/component/FileListItem.qml

@@ -84,17 +84,8 @@ FluArea {
         }
     }
 
-    ColumnLayout {
-        id: row
-        anchors.fill: parent
-        anchors.margins: 10
-        spacing: 10
-
-        ColumnLayout {
-            id: clickable
-            anchors.fill: parent
     MouseArea {
-                anchors.fill: parent
+        anchors.fill: row
         acceptedButtons: Qt.LeftButton | Qt.RightButton
         onDoubleClicked: {
             fileItem.parent.doubleClicked()
@@ -105,6 +96,11 @@ FluArea {
             }
         }
     }
+
+    ColumnLayout {
+        id: clickable
+        anchors.fill: row
+
         RowLayout {
             id: titleRow
             Image {
@@ -161,6 +157,13 @@ FluArea {
             }
         }
     }
+
+    ColumnLayout {
+        id: row
+        anchors.fill: parent
+        anchors.margins: 10
+        spacing: 10
+
         RowLayout {
             visible: !fileItem.isDir
             Repeater {

AicsKnowledgeBase/qml/component/Tag.qml

@@ -16,27 +16,29 @@ Rectangle {
     radius: 5
     clip: true
 
-    ListModel { id: tagListModel }
+    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){
+        Request.get("tag?name", function (result, data) {
             //                        console.log("success")
             //                        console.log(result)
             //                        console.log(data.length)
             for (var i = 0; i < data.length; i++) {
-                            tagMap.push([data[i].id,data[i].name])
+                tagMap.push(data[i])
                 presetsTags.push(data[i].name)
-                            presetsTagsItem.push({title:data[i].name})
+                presetsTagsItem.push({
+                                         "title": data[i].name
+                                     })
             }
             //                        console.log(tagMap)
             //                        console.log(presetsTags)
-                    },function (p1, p2) {
-//                        console.log("failure")
+        }, function (p1, p2) {//                        console.log("failure")
             //                        console.log(p1)
             //                        console.log(p2)
         })
@@ -62,7 +64,9 @@ Rectangle {
                             tagListModel.remove(index)
                         })
 
-                        item.tag = Qt.binding(function(){return tag})
+                        item.tag = Qt.binding(function () {
+                            return tag
+                        })
                     }
                 }
             }
@@ -77,7 +81,6 @@ Rectangle {
                 anchors.verticalCenter: parent.verticalCenter
                 width: parent.width
 
-
                 placeholderText: "按回车键Enter创建标签"
                 Layout.preferredWidth: 300
                 //items:[{title:"前端"},{title:"后端"},{title:"数据库"}]
@@ -92,14 +95,18 @@ Rectangle {
                     if (text.length === 0)
                         return
 
-                    if(presetsTags.indexOf(text) === -1){
-                        text = ""
-                        return
-                    }
-                    tagListModel.append({"tag": text})
+                    var tagId
+                    for (var i = 0; i < tagMap.length; i++) {
+                        if (tagMap[i].name === text) {
+                            tagListModel.append({
+                                                    "tag": text,
+                                                    "id": tagMap[i].id
+                                                })
                             //console.log(tagListModel.get(0))
                             text = ""
                         }
+                    }
+                }
                 Keys.onPressed: {
                     if (event.key === Qt.Key_Backspace) {
                         if (text.length === 0 && tagListModel.count) {
@@ -111,11 +118,10 @@ Rectangle {
         }
     }
 
-    property Component tagItem:
-        Rectangle {
+    property Component tagItem: Rectangle {
         id: rootTagItem
         property alias tag: tagText.text
-        signal closeClicked()
+        signal closeClicked
 
         width: content.width
         height: 25
@@ -136,7 +142,10 @@ Rectangle {
                 anchors.verticalCenter: parent.verticalCenter
                 height: rootTagItem.height
 
-                Item { width: 5; height: 1 }
+                Item {
+                    width: 5
+                    height: 1
+                }
 
                 Text {
                     id: tagText
@@ -146,7 +155,11 @@ Rectangle {
                     color: "white"
                 }
 
-                Item { visible: mouseArea.hovered; width: 5; height: 1 }
+                Item {
+                    visible: mouseArea.hovered
+                    width: 5
+                    height: 1
+                }
 
                 Item {
                     anchors.verticalCenter: parent.verticalCenter
@@ -154,11 +167,15 @@ Rectangle {
                     height: rootTagItem.height
                     visible: mouseArea.hovered
                     Behavior on width {
-                        NumberAnimation {duration: 100}
+                        NumberAnimation {
+                            duration: 100
+                        }
                     }
 
                     Behavior on visible {
-                        NumberAnimation {duration: 100}
+                        NumberAnimation {
+                            duration: 100
+                        }
                     }
 
                     Rectangle {
@@ -189,9 +206,11 @@ Rectangle {
                     }
                 }
 
-                Item { width: 5; height: 1 }
+                Item {
+                    width: 5
+                    height: 1
+                }
             }
         }
     }
 }
-

AicsKnowledgeBase/qml/component/UploadButton.qml

@@ -14,7 +14,8 @@ FluButton {
     text: "上传"
     onClicked: function () {
         console.log("click")
-        fileDialog.open()
+        //fileDialog.open()
+        popup.open()
     }
     FileDialog {
         id: fileDialog
@@ -52,7 +53,7 @@ FluButton {
                 }
             }
 
-            Row {
+            Column {
                 id: content
                 topPadding: 14
                 leftPadding: 20
@@ -68,6 +69,9 @@ FluButton {
                     width: parent.width - parent.leftPadding - parent.rightPadding
                     placeholderText: "请输入简介"
                 }
+                Tag {
+                    id: tags
+                }
             }
 
             Rectangle {
@@ -106,6 +110,13 @@ FluButton {
                         Layout.fillHeight: true
                         text: "上传"
                         onClicked: {
+                            for (var i = 0; i < tags.tagList.count; i++) {
+                                console.log(tags.tagList.get(i).tag)
+                                console.log(tags.tagList.get(i).id)
+                            }
+
+                            return
+
                             popup.close()
                             let name = FileTransferManager.getFileName(
                                     currentSelectedFile)

AicsKnowledgeBase/src/FileTransferListModel.cpp

@@ -11,7 +11,7 @@ FileTransferListModel::FileTransferListModel(QObject *parent)
 	m_roleName.insert(kSpeedRole, "speed");
 	m_roleName.insert(kPausedRole, "paused");
 
-	m_data.append({true, "id", "name", 30, 100, 30});
+	//m_data.append({true, "id", "name", 30, 100, 30});
 }