修复任务提交与弹窗交互问题
This commit is contained in:
@ -61,6 +61,14 @@ enum MaterialMediaType: Int, CaseIterable, Sendable, Equatable {
|
||||
case .video: 1
|
||||
}
|
||||
}
|
||||
|
||||
/// 云盘文件类型,视频为 1、图片为 2。
|
||||
var cloudFileType: Int {
|
||||
switch self {
|
||||
case .image: 2
|
||||
case .video: 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 素材列表项,对齐 Android `MaterialItemEntity`。
|
||||
|
||||
@ -354,6 +354,48 @@ final class MaterialFormViewModel {
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
/// 增加云盘素材文件,文件已在云盘中时直接使用其 URL。
|
||||
func addCloudMediaFiles(_ files: [CloudFile]) {
|
||||
guard !files.isEmpty else { return }
|
||||
let remaining = mediaType.maxCount - uploadedMediaList.count
|
||||
guard remaining > 0 else {
|
||||
onShowMessage?(mediaType == .video ? "视频只能上传1个" : "图片最多上传9张")
|
||||
return
|
||||
}
|
||||
|
||||
var seenCloudIDs = importedCloudFileIDs
|
||||
var accepted: [MaterialUploadedMediaItem] = []
|
||||
for file in files where accepted.count < remaining {
|
||||
let fileURL = file.fileUrl.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
guard file.type == mediaType.cloudFileType, !fileURL.isEmpty, !seenCloudIDs.contains(file.id) else {
|
||||
continue
|
||||
}
|
||||
seenCloudIDs.insert(file.id)
|
||||
accepted.append(
|
||||
MaterialUploadedMediaItem(
|
||||
id: "cloud_\(file.id)",
|
||||
data: Data(),
|
||||
thumbnailData: nil,
|
||||
previewURL: file.coverUrl.isEmpty ? fileURL : file.coverUrl,
|
||||
fileName: file.name.isEmpty ? "cloud_file_\(file.id)" : file.name,
|
||||
size: file.fileSize,
|
||||
width: 0,
|
||||
height: 0,
|
||||
ossUrl: fileURL,
|
||||
isUploading: false,
|
||||
uploadProgress: 100
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
guard !accepted.isEmpty else {
|
||||
onShowMessage?(mediaType == .video ? "请选择视频素材" : "请选择图片素材")
|
||||
return
|
||||
}
|
||||
uploadedMediaList.append(contentsOf: accepted)
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
/// 设置封面并立即上传。
|
||||
func setCoverImage(_ item: MaterialUploadedMediaItem, uploader: any MaterialOSSUploading) async {
|
||||
coverImage = item
|
||||
@ -376,6 +418,16 @@ final class MaterialFormViewModel {
|
||||
notifyStateChange()
|
||||
}
|
||||
|
||||
/// 已从云盘导入的文件 ID。
|
||||
var importedCloudFileIDs: Set<Int> {
|
||||
Set(
|
||||
uploadedMediaList.compactMap { item in
|
||||
guard item.id.hasPrefix("cloud_") else { return nil }
|
||||
return Int(item.id.dropFirst("cloud_".count))
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
/// 上传或编辑素材。
|
||||
func submit(api: any MaterialManagementServing) async {
|
||||
guard !materialName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
|
||||
|
||||
Reference in New Issue
Block a user