|
|
@@ -2,7 +2,7 @@ import React, { useState, useRef } from 'react';
|
|
|
import { Button } from '@/client/components/ui/button';
|
|
|
import { Card, CardContent, CardHeader, CardTitle } from '@/client/components/ui/card';
|
|
|
import { toast } from 'sonner';
|
|
|
-import { Upload, Download, Trash2, FileText } from 'lucide-react';
|
|
|
+import { Upload, Download, Trash2, FileText, GitMerge } from 'lucide-react';
|
|
|
|
|
|
interface WordFile {
|
|
|
id: string;
|
|
|
@@ -217,7 +217,7 @@ const WordMergePage: React.FC = () => {
|
|
|
disabled={files.length < 2 || isMerging}
|
|
|
className="w-full"
|
|
|
>
|
|
|
- <FileMerge className="h-4 w-4 mr-2" />
|
|
|
+ <GitMerge className="h-4 w-4 mr-2" />
|
|
|
{isMerging ? '合并中...' : `合并文档 (${files.length})`}
|
|
|
</Button>
|
|
|
|