add12345
This commit is contained in:
ditiqi
parent
b101cc8e3b
commit
a5552dba6b
|
|
@ -1,19 +1,29 @@
|
|||
import { useCallback, useState } from "react";
|
||||
// TusUploader.tsx
|
||||
import {
|
||||
useCallback,
|
||||
useState,
|
||||
useEffect,
|
||||
forwardRef,
|
||||
useImperativeHandle,
|
||||
} from "react";
|
||||
import {
|
||||
UploadOutlined,
|
||||
CheckCircleOutlined,
|
||||
DeleteOutlined,
|
||||
} from "@ant-design/icons";
|
||||
import { Upload, Progress, Button } from "antd";
|
||||
import type { UploadFile } from "antd";
|
||||
import { useTusUpload } from "@web/src/hooks/useTusUpload";
|
||||
import toast from "react-hot-toast";
|
||||
import { getCompressedImageUrl } from "@nice/utils";
|
||||
|
||||
export interface TusUploaderProps {
|
||||
value?: string[];
|
||||
onChange?: (value: string[]) => void;
|
||||
}
|
||||
|
||||
export interface TusUploaderRef {
|
||||
reset: () => void;
|
||||
}
|
||||
|
||||
interface UploadingFile {
|
||||
name: string;
|
||||
progress: number;
|
||||
|
|
@ -22,164 +32,179 @@ interface UploadingFile {
|
|||
fileKey?: string;
|
||||
}
|
||||
|
||||
export const TusUploader = ({ value = [], onChange }: TusUploaderProps) => {
|
||||
const { handleFileUpload, uploadProgress } = useTusUpload();
|
||||
const [uploadingFiles, setUploadingFiles] = useState<UploadingFile[]>([]);
|
||||
const [completedFiles, setCompletedFiles] = useState<UploadingFile[]>(
|
||||
() =>
|
||||
value?.map((fileId) => ({
|
||||
name: `文件 ${fileId}`,
|
||||
progress: 100,
|
||||
status: "done" as const,
|
||||
fileId,
|
||||
})) || []
|
||||
);
|
||||
// 恢复使用 uploadResults 状态跟踪最新结果
|
||||
const [uploadResults, setUploadResults] = useState<string[]>(value || []);
|
||||
const handleRemoveFile = useCallback(
|
||||
(fileId: string) => {
|
||||
setCompletedFiles((prev) =>
|
||||
prev.filter((f) => f.fileId !== fileId)
|
||||
export const TusUploader = forwardRef<TusUploaderRef, TusUploaderProps>(
|
||||
({ value = [], onChange }, ref) => {
|
||||
const { handleFileUpload, uploadProgress } = useTusUpload();
|
||||
const [uploadingFiles, setUploadingFiles] = useState<UploadingFile[]>(
|
||||
[]
|
||||
);
|
||||
const [completedFiles, setCompletedFiles] = useState<UploadingFile[]>(
|
||||
[]
|
||||
);
|
||||
|
||||
// 同步父组件value到completedFiles
|
||||
useEffect(() => {
|
||||
setCompletedFiles(
|
||||
value.map((fileId) => ({
|
||||
name: `文件 ${fileId}`,
|
||||
progress: 100,
|
||||
status: "done" as const,
|
||||
fileId,
|
||||
}))
|
||||
);
|
||||
// 使用函数式更新保证获取最新状态
|
||||
setUploadResults((prev) => {
|
||||
const newValue = prev.filter((id) => id !== fileId);
|
||||
onChange?.(newValue); // 同步更新父组件
|
||||
return newValue;
|
||||
});
|
||||
},
|
||||
[onChange]
|
||||
);
|
||||
}, [value]);
|
||||
|
||||
const handleBeforeUpload = useCallback(
|
||||
(file: File) => {
|
||||
const fileKey = `${file.name}-${Date.now()}`;
|
||||
// 暴露重置方法
|
||||
useImperativeHandle(ref, () => ({
|
||||
reset: () => {
|
||||
setCompletedFiles([]);
|
||||
setUploadingFiles([]);
|
||||
},
|
||||
}));
|
||||
|
||||
setUploadingFiles((prev) => [
|
||||
...prev,
|
||||
{
|
||||
name: file.name,
|
||||
progress: 0,
|
||||
status: "uploading",
|
||||
fileKey,
|
||||
},
|
||||
]);
|
||||
const handleRemoveFile = useCallback(
|
||||
(fileId: string) => {
|
||||
setCompletedFiles((prev) =>
|
||||
prev.filter((f) => f.fileId !== fileId)
|
||||
);
|
||||
onChange?.(value.filter((id) => id !== fileId));
|
||||
},
|
||||
[onChange, value]
|
||||
);
|
||||
|
||||
handleFileUpload(
|
||||
file,
|
||||
(result) => {
|
||||
setCompletedFiles((prev) => [
|
||||
...prev,
|
||||
{
|
||||
name: file.name,
|
||||
progress: 100,
|
||||
status: "done",
|
||||
fileId: result.fileId,
|
||||
},
|
||||
]);
|
||||
|
||||
setUploadingFiles((prev) =>
|
||||
prev.filter((f) => f.fileKey !== fileKey)
|
||||
);
|
||||
|
||||
// 正确的状态更新方式
|
||||
setUploadResults((prev) => {
|
||||
const newValue = [...prev, result.fileId];
|
||||
onChange?.(newValue); // 传递值而非函数
|
||||
return newValue;
|
||||
});
|
||||
},
|
||||
(error) => {
|
||||
console.error("上传错误:", error);
|
||||
toast.error(
|
||||
`上传失败: ${
|
||||
error instanceof Error ? error.message : "未知错误"
|
||||
}`
|
||||
);
|
||||
setUploadingFiles((prev) =>
|
||||
prev.map((f) =>
|
||||
f.fileKey === fileKey
|
||||
? { ...f, status: "error" }
|
||||
: f
|
||||
)
|
||||
);
|
||||
},
|
||||
fileKey
|
||||
const handleRemoveUploadingFile = useCallback((fileKey: string) => {
|
||||
setUploadingFiles((prev) =>
|
||||
prev.filter((f) => f.fileKey !== fileKey)
|
||||
);
|
||||
}, []);
|
||||
|
||||
return false;
|
||||
},
|
||||
[handleFileUpload, onChange]
|
||||
);
|
||||
const handleBeforeUpload = useCallback(
|
||||
(file: File) => {
|
||||
const fileKey = `${file.name}-${Date.now()}`;
|
||||
|
||||
return (
|
||||
<div className="space-y-1">
|
||||
<Upload.Dragger
|
||||
name="files"
|
||||
multiple
|
||||
showUploadList={false}
|
||||
style={{ background: "transparent", borderStyle: "none" }}
|
||||
beforeUpload={handleBeforeUpload}>
|
||||
<p className="ant-upload-drag-icon">
|
||||
<UploadOutlined />
|
||||
</p>
|
||||
<p className="ant-upload-text">
|
||||
点击或拖拽文件到此区域进行上传
|
||||
</p>
|
||||
<p className="ant-upload-hint">支持单个或批量上传文件</p>
|
||||
setUploadingFiles((prev) => [
|
||||
...prev,
|
||||
{
|
||||
name: file.name,
|
||||
progress: 0,
|
||||
status: "uploading",
|
||||
fileKey,
|
||||
},
|
||||
]);
|
||||
|
||||
{/* 上传状态展示 */}
|
||||
<div className="px-2 py-0 rounded mt-1">
|
||||
{/* 上传中的文件 */}
|
||||
{uploadingFiles.map((file) => (
|
||||
<div
|
||||
key={file.fileKey}
|
||||
className="flex flex-col gap-1 mb-2">
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="text-sm">{file.name}</span>
|
||||
handleFileUpload(
|
||||
file,
|
||||
(result) => {
|
||||
const newValue = [...value, result.fileId];
|
||||
onChange?.(newValue);
|
||||
setUploadingFiles((prev) =>
|
||||
prev.filter((f) => f.fileKey !== fileKey)
|
||||
);
|
||||
},
|
||||
(error) => {
|
||||
console.error("上传错误:", error);
|
||||
toast.error(
|
||||
`上传失败: ${error instanceof Error ? error.message : "未知错误"}`
|
||||
);
|
||||
setUploadingFiles((prev) =>
|
||||
prev.map((f) =>
|
||||
f.fileKey === fileKey
|
||||
? { ...f, status: "error" }
|
||||
: f
|
||||
)
|
||||
);
|
||||
},
|
||||
fileKey
|
||||
);
|
||||
|
||||
return false;
|
||||
},
|
||||
[handleFileUpload, onChange, value]
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="space-y-1">
|
||||
<Upload.Dragger
|
||||
name="files"
|
||||
multiple
|
||||
showUploadList={false}
|
||||
style={{ background: "transparent", borderStyle: "none" }}
|
||||
beforeUpload={handleBeforeUpload}>
|
||||
<p className="ant-upload-drag-icon">
|
||||
<UploadOutlined />
|
||||
</p>
|
||||
<p className="ant-upload-text">
|
||||
点击或拖拽文件到此区域进行上传
|
||||
</p>
|
||||
<p className="ant-upload-hint">支持单个或批量上传文件</p>
|
||||
|
||||
<div className="px-2 py-0 rounded mt-1">
|
||||
{uploadingFiles.map((file) => (
|
||||
<div
|
||||
key={file.fileKey}
|
||||
className="flex flex-col gap-1 mb-2">
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="text-sm">{file.name}</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-2">
|
||||
<Progress
|
||||
percent={
|
||||
file.status === "done"
|
||||
? 100
|
||||
: Math.round(
|
||||
uploadProgress?.[
|
||||
file.fileKey!
|
||||
] || 0
|
||||
)
|
||||
}
|
||||
status={
|
||||
file.status === "error"
|
||||
? "exception"
|
||||
: "active"
|
||||
}
|
||||
className="flex-1"
|
||||
/>
|
||||
{file.status === "error" && (
|
||||
<Button
|
||||
type="text"
|
||||
danger
|
||||
icon={<DeleteOutlined />}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
if (file.fileKey)
|
||||
handleRemoveUploadingFile(
|
||||
file.fileKey
|
||||
);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<Progress
|
||||
percent={
|
||||
file.status === "done"
|
||||
? 100
|
||||
: Math.round(
|
||||
uploadProgress?.[
|
||||
file.fileKey!
|
||||
] || 0
|
||||
)
|
||||
}
|
||||
status={
|
||||
file.status === "error"
|
||||
? "exception"
|
||||
: "active"
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
))}
|
||||
|
||||
{/* 已完成的文件 */}
|
||||
{completedFiles.map((file) => (
|
||||
<div
|
||||
key={file.fileId}
|
||||
className="flex items-center justify-between gap-2 mb-2">
|
||||
<div className="flex items-center gap-2">
|
||||
<CheckCircleOutlined className="text-green-500" />
|
||||
<span className="text-sm">{file.name}</span>
|
||||
{completedFiles.map((file) => (
|
||||
<div
|
||||
key={file.fileId}
|
||||
className="flex items-center justify-between gap-2 mb-2">
|
||||
<div className="flex items-center gap-2">
|
||||
<CheckCircleOutlined className="text-green-500" />
|
||||
<span className="text-sm">{file.name}</span>
|
||||
</div>
|
||||
<Button
|
||||
type="text"
|
||||
danger
|
||||
icon={<DeleteOutlined />}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
if (file.fileId)
|
||||
handleRemoveFile(file.fileId);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<Button
|
||||
type="text"
|
||||
danger
|
||||
icon={<DeleteOutlined />}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
if (file.fileId)
|
||||
handleRemoveFile(file.fileId);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</Upload.Dragger>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
))}
|
||||
</div>
|
||||
</Upload.Dragger>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import React, { useContext, useState } from "react";
|
||||
import React, { useContext, useRef, useState } from "react";
|
||||
import { motion } from "framer-motion";
|
||||
import { Button, Input, Tabs } from "antd";
|
||||
import QuillEditor from "@web/src/components/common/editor/quill/QuillEditor";
|
||||
|
|
@ -19,6 +19,7 @@ export default function PostCommentEditor() {
|
|||
const [signature, setSignature] = useState<string | undefined>(undefined);
|
||||
const [fileIds, setFileIds] = useState<string[]>([]);
|
||||
const { create } = usePost();
|
||||
const uploaderRef = useRef<{ reset: () => void }>(null);
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
|
|
@ -46,7 +47,10 @@ export default function PostCommentEditor() {
|
|||
});
|
||||
toast.success("发布成功！");
|
||||
setContent("");
|
||||
setFileIds([]);
|
||||
setFileIds([]); // 重置上传组件状态
|
||||
// if (uploaderRef.current) {
|
||||
// uploaderRef.current.reset();
|
||||
// }
|
||||
} catch (error) {
|
||||
toast.error("发布失败，请稍后重试");
|
||||
console.error("Error posting comment:", error);
|
||||
|
|
@ -86,6 +90,8 @@ export default function PostCommentEditor() {
|
|||
<TabPane tab="附件" key="2">
|
||||
<div className="relative rounded-xl border border-white hover:ring-1 ring-white transition-all duration-300 ease-in-out bg-slate-100">
|
||||
<TusUploader
|
||||
ref={uploaderRef}
|
||||
value={fileIds}
|
||||
onChange={(value) => {
|
||||
console.log("ids", value);
|
||||
setFileIds(value);
|
||||
|
|
|
|||
|
|
@ -45,12 +45,12 @@ export function useTusUpload() {
|
|||
onError: (error: Error) => void,
|
||||
fileKey: string // 添加文件唯一标识
|
||||
) => {
|
||||
if (!file || !file.name || !file.type) {
|
||||
const error = new Error("不可上传该类型文件");
|
||||
setUploadError(error.message);
|
||||
onError(error);
|
||||
return;
|
||||
}
|
||||
// if (!file || !file.name || !file.type) {
|
||||
// const error = new Error("不可上传该类型文件");
|
||||
// setUploadError(error.message);
|
||||
// onError(error);
|
||||
// return;
|
||||
// }
|
||||
|
||||
setIsUploading(true);
|
||||
setUploadProgress((prev) => ({ ...prev, [fileKey]: 0 }));
|
||||
|
|
|
|||
Loading…
Reference in New Issue