From 2c1e0ab7ac8335b2703ae93751430aea2afca1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AC=94=E8=AE=B0=E6=9C=AC=E9=87=8C=E7=9A=84=E6=B0=B8?=
 =?UTF-8?q?=E5=B9=B3?= <fsmecx@gmail.com>
Date: Thu, 10 Jul 2025 11:50:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=AC=E6=AC=A1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=E5=A6=82=E4=B8=8B=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=8A=9F=E8=83=BD=E8=A1=A5=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContentLibrarySelectionDialog.tsx         | 33 +++++++++++--------
 .../pages/workspace/moments-sync/Detail.tsx   |  2 +-
 .../workspace/moments-sync/MomentsSync.tsx    | 13 +++++---
 .../src/pages/workspace/moments-sync/new.tsx  | 27 ++++++++++++---
 .../traffic-distribution/NewDistribution.tsx  |  6 ++--
 .../TrafficDistribution.tsx                   |  7 ++--
 nkebao/src/types/moments-sync.ts              |  9 ++++-
 7 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/nkebao/src/components/ContentLibrarySelectionDialog.tsx b/nkebao/src/components/ContentLibrarySelectionDialog.tsx
index dcbbc0a1..1da62d47 100644
--- a/nkebao/src/components/ContentLibrarySelectionDialog.tsx
+++ b/nkebao/src/components/ContentLibrarySelectionDialog.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect, useCallback } from 'react';
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
-import { Checkbox } from '@/components/ui/checkbox';
+import { Badge } from '@/components/ui/badge';
 import { Search, RefreshCw, Loader2 } from 'lucide-react';
 import { fetchContentLibraryList } from '@/api/content';
 import { ContentLibrary } from '@/api/content';
@@ -50,7 +50,7 @@ export function ContentLibrarySelectionDialog({
       fetchLibraries();
       setTempSelected(selectedLibraries);
     }
-  }, [open, searchQuery, selectedLibraries, fetchLibraries]);
+  }, [open, selectedLibraries, fetchLibraries]);
 
   const handleRefresh = () => {
     fetchLibraries();
@@ -86,7 +86,7 @@ export function ContentLibrarySelectionDialog({
 
   return (
     <Dialog open={open} onOpenChange={handleDialogOpenChange}>
-      <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col">
+      <DialogContent className="flex flex-col">
         <DialogHeader>
           <DialogTitle>选择内容库</DialogTitle>
         </DialogHeader>
@@ -136,17 +136,24 @@ export function ContentLibrarySelectionDialog({
               libraries.map((library) => (
                 <label
                   key={library.id}
-                  className="flex items-center justify-between p-4 rounded-lg border hover:bg-gray-50 cursor-pointer"
+                  className="flex items-start space-x-3 p-4 rounded-lg hover:bg-gray-50 cursor-pointer border"
                 >
-                  <div className="flex items-center space-x-3 flex-1 min-w-0 pr-4">
-                    <Checkbox 
-                      checked={tempSelected.includes(library.id)}
-                      onCheckedChange={() => handleLibraryToggle(library.id)}
-                    />
-                    <div className="min-w-0 flex-1">
-                      <div className="font-medium truncate mb-1">{library.name}</div>
-                      <div className="text-sm text-gray-500 truncate mb-1">创建人：{library.creatorName}</div>
-                      <div className="text-sm text-gray-500 truncate">更新时间：{new Date(library.updateTime).toLocaleString()}</div>
+                  <input
+                    type="checkbox"
+                    checked={tempSelected.includes(library.id)}
+                    onChange={() => handleLibraryToggle(library.id)}
+                    className="mt-1 w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 focus:ring-2"
+                  />
+                  <div className="flex-1">
+                    <div className="flex items-center justify-between">
+                      <span className="font-medium">{library.name}</span>
+                      <Badge variant="outline">
+                        {library.sourceType === 1 ? '文本' : library.sourceType === 2 ? '图片' : '视频'}
+                      </Badge>
+                    </div>
+                    <div className="text-sm text-gray-500 mt-1">
+                      <div>创建人: {library.creatorName || '-'}</div>
+                      <div>更新时间: {new Date(library.updateTime).toLocaleString()}</div>
                     </div>
                   </div>
                 </label>
diff --git a/nkebao/src/pages/workspace/moments-sync/Detail.tsx b/nkebao/src/pages/workspace/moments-sync/Detail.tsx
index 5bad25da..283f96be 100644
--- a/nkebao/src/pages/workspace/moments-sync/Detail.tsx
+++ b/nkebao/src/pages/workspace/moments-sync/Detail.tsx
@@ -162,7 +162,7 @@ export default function MomentsSyncDetail() {
                   </div>
                   <div className="flex items-center justify-between">
                     <span className="text-gray-600">创建人</span>
-                    <span className="font-medium">{task.creator}</span>
+                    <span className="font-medium">{task.creatorName}</span>
                   </div>
                 </div>
               </div>
diff --git a/nkebao/src/pages/workspace/moments-sync/MomentsSync.tsx b/nkebao/src/pages/workspace/moments-sync/MomentsSync.tsx
index 11eb5d96..064e0f91 100644
--- a/nkebao/src/pages/workspace/moments-sync/MomentsSync.tsx
+++ b/nkebao/src/pages/workspace/moments-sync/MomentsSync.tsx
@@ -107,7 +107,7 @@ export default function MomentsSync() {
         deviceCount: task.deviceCount || 0,
         targetGroup: task.targetGroup || '默认人群',
         syncCount: task.todaySyncCount || task.syncCount || 0,
-        creator: task.creator || '未知',
+        creatorName: task.creatorName || '未知',
         lastSyncTime: task.lastSyncTime || '暂无',
         createTime: task.createTime || '未知',
         syncInterval: task.syncInterval || 30,
@@ -117,7 +117,7 @@ export default function MomentsSync() {
         targetTags: task.targetTags || [],
         syncMode: task.syncMode || 'auto',
         filterKeywords: task.filterKeywords || [],
-        contentLib: task.contentLib || '默认内容库'
+        contentLib: task.config?.contentLibraryNames?.join(',') || '默认内容库'
       }));
       setTasks(mappedTasks);
     } catch (error) {
@@ -301,11 +301,16 @@ export default function MomentsSync() {
                 <div className="grid grid-cols-2 gap-4 mb-4">
                   <div className="text-sm text-gray-500">
                     <div>推送设备：{task.deviceCount} 个</div>
-                    <div>内容库：{task.contentLib || '默认内容库'}</div>
+                    <div className="flex">
+                      <span className="flex-shrink-0">内容库：</span>
+                      <span className="truncate" title={task.contentLib || '默认内容库'}>
+                        {task.contentLib || '默认内容库'}
+                      </span>
+                    </div>
                   </div>
                   <div className="text-sm text-gray-500">
                     <div>已同步：{task.syncCount} 条</div>
-                    <div>创建人：{task.creator}</div>
+                    <div>创建人：{task.creatorName}</div>
                   </div>
                 </div>
 
diff --git a/nkebao/src/pages/workspace/moments-sync/new.tsx b/nkebao/src/pages/workspace/moments-sync/new.tsx
index 75fcc9c3..3d8c3b70 100644
--- a/nkebao/src/pages/workspace/moments-sync/new.tsx
+++ b/nkebao/src/pages/workspace/moments-sync/new.tsx
@@ -23,19 +23,38 @@ function StepIndicator({ currentStep }: StepIndicatorProps) {
   ];
 
   return (
-    <div className="flex justify-between px-6 mb-8">
+    <div className="relative flex justify-between px-6 mb-8">
+      {/* 连线 - 背景线 */}
+      <div className="absolute top-5 left-0 right-0 h-[1px] bg-gray-200" style={{ width: '100%', zIndex: 0 }} />
+      
+      {/* 连线 - 已完成线 */}
+      <div 
+        className="absolute top-5 left-0 h-[1px] bg-blue-600 transition-all duration-300" 
+        style={{ 
+          width: `${((currentStep - 1) / (steps.length - 1)) * 100}%`, 
+          zIndex: 1 
+        }} 
+      />
+      
+      {/* 步骤圆圈 */}
       {steps.map((step, index) => (
-        <div key={step.id} className="flex flex-col items-center">
+        <div key={step.id} className="flex flex-col items-center relative z-10">
           <div 
             className={`w-10 h-10 rounded-full flex items-center justify-center mb-2 ${
               currentStep === index + 1 
                 ? "bg-blue-600 text-white" 
-                : "bg-white text-gray-400 border border-gray-200"
+                : index + 1 < currentStep
+                  ? "bg-blue-600 text-white"
+                  : "bg-white text-gray-400 border border-gray-200"
             }`}
           >
             {index + 1}
           </div>
-          <div className={`text-sm ${currentStep === index + 1 ? "text-blue-600" : "text-gray-400"}`}>
+          <div className={`text-sm ${
+            currentStep === index + 1 || index + 1 < currentStep 
+              ? "text-blue-600" 
+              : "text-gray-400"
+          }`}>
             {step.title}
           </div>
         </div>
diff --git a/nkebao/src/pages/workspace/traffic-distribution/NewDistribution.tsx b/nkebao/src/pages/workspace/traffic-distribution/NewDistribution.tsx
index 23be78bb..9725c1b4 100644
--- a/nkebao/src/pages/workspace/traffic-distribution/NewDistribution.tsx
+++ b/nkebao/src/pages/workspace/traffic-distribution/NewDistribution.tsx
@@ -1,4 +1,4 @@
-import React, { useState, ChangeEvent } from 'react';
+import React, { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
   ChevronLeft,
@@ -92,7 +92,7 @@ function StepIndicator({ currentStep, steps }: StepIndicatorProps) {
   return (
     <div className="w-full mb-6 px-12">
       <Steps current={currentStep} layout="horizontal">
-        {steps.map((step, index) => (
+      {steps.map((step, index) => (
           <StepItem 
             key={step.id} 
             title={step.title} 
@@ -102,7 +102,7 @@ function StepIndicator({ currentStep, steps }: StepIndicatorProps) {
               index < currentStep ? 'finish' : 'default'
             }
           />
-        ))}
+      ))}
       </Steps>
     </div>
   );
diff --git a/nkebao/src/pages/workspace/traffic-distribution/TrafficDistribution.tsx b/nkebao/src/pages/workspace/traffic-distribution/TrafficDistribution.tsx
index 2c521090..7a041d50 100644
--- a/nkebao/src/pages/workspace/traffic-distribution/TrafficDistribution.tsx
+++ b/nkebao/src/pages/workspace/traffic-distribution/TrafficDistribution.tsx
@@ -2,7 +2,6 @@ import React, { useState, useEffect, useRef } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
   Plus,
-  Filter,
   Search,
   RefreshCw,
   MoreVertical,
@@ -12,7 +11,6 @@ import {
   Pause,
   Play,
   Users,
-  Share2,
 } from 'lucide-react';
 import { Card } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
@@ -85,6 +83,8 @@ export default function TrafficDistribution() {
     navigate(`/workspace/traffic-distribution/${ruleId}`);
   };
 
+  // 注释掉未使用的函数
+  /* 
   const handleCopy = async (ruleId: string) => {
     const ruleToCopy = tasks.find((rule) => rule.id === ruleId);
     if (ruleToCopy) {
@@ -106,6 +106,7 @@ export default function TrafficDistribution() {
       }
     }
   };
+  */
 
   const toggleRuleStatus = async (ruleId: string) => {
     const rule = tasks.find((r) => r.id === ruleId);
@@ -284,7 +285,7 @@ export default function TrafficDistribution() {
   // 初始加载和搜索
   useEffect(() => {
     fetchData(1, searchTerm);
-  }, []);
+  }, [searchTerm]); // 添加依赖项
 
   // 处理搜索
   const handleSearch = () => {
diff --git a/nkebao/src/types/moments-sync.ts b/nkebao/src/types/moments-sync.ts
index 96f07e58..4b66f7d7 100644
--- a/nkebao/src/types/moments-sync.ts
+++ b/nkebao/src/types/moments-sync.ts
@@ -7,6 +7,12 @@ export type ContentType = 'text' | 'image' | 'video' | 'link';
 // 同步模式
 export type SyncMode = 'auto' | 'manual';
 
+// 配置信息
+export interface MomentsSyncConfig {
+  contentLibraryNames: string[];
+  [key: string]: any;
+}
+
 // 朋友圈同步任务
 export interface MomentsSyncTask {
   id: string;
@@ -17,7 +23,7 @@ export interface MomentsSyncTask {
   syncCount: number;
   lastSyncTime: string;
   createTime: string;
-  creator: string;
+  creatorName: string;
   syncInterval: number;
   maxSyncPerDay: number;
   timeRange: { start: string; end: string };
@@ -31,6 +37,7 @@ export interface MomentsSyncTask {
   todaySyncCount: number;
   totalSyncCount: number;
   updateTime: string;
+  config?: MomentsSyncConfig;
 }
 
 // 创建任务数据