Compare commits

...

2 Commits

Author SHA1 Message Date
wuyize b67075a3ba 修改Tag组件 2023-07-07 02:28:21 +08:00
wuyize e10fddb188 解决了FileListItem的警告 2023-07-07 01:57:45 +08:00
5 changed files with 152 additions and 158 deletions

View File

@ -164,47 +164,8 @@ Item {
} }
} }
} }
FluButton { UploadButton {
id: uploadIcon
Layout.alignment: Qt.AlignRight 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 { RowLayout {

View File

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

View File

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

View File

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

View File

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