From 0abddfbfb3a4a51fe85276257d956c582cc80382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=80=81=E7=99=BD=E5=85=94?=
 <fsmecx@gmail.com>
Date: Fri, 8 Aug 2025 15:03:45 +0800
Subject: [PATCH] =?UTF-8?q?FEAT=20=3D>=20=E6=9C=AC=E6=AC=A1=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B9=E7=9B=AE=E4=B8=BA=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/AccountSelection/index.tsx |  2 +-
 .../src/components/ContentSelection/data.ts   |  2 +-
 .../src/components/ContentSelection/index.tsx | 24 +++++++++----------
 nkebao/src/components/GroupSelection/data.ts  |  2 +-
 .../src/components/GroupSelection/index.tsx   | 14 +++++------
 nkebao/src/pages/mobile/test/select.tsx       |  4 ++--
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/nkebao/src/components/AccountSelection/index.tsx b/nkebao/src/components/AccountSelection/index.tsx
index 96def66be..6e19a88b3 100644
--- a/nkebao/src/components/AccountSelection/index.tsx
+++ b/nkebao/src/components/AccountSelection/index.tsx
@@ -100,7 +100,7 @@ export default function AccountSelection({
                   textOverflow: "ellipsis",
                 }}
               >
-                {acc.userName}（{acc.realName}）- {acc.departmentName}
+                【{acc.realName}】 {acc.userName}
               </div>
               {!readonly && (
                 <Button
diff --git a/nkebao/src/components/ContentSelection/data.ts b/nkebao/src/components/ContentSelection/data.ts
index 5ea44b907..1bf8fdb8f 100644
--- a/nkebao/src/components/ContentSelection/data.ts
+++ b/nkebao/src/components/ContentSelection/data.ts
@@ -7,7 +7,7 @@ export interface ContentItem {
 
 // 组件属性接口
 export interface ContentSelectionProps {
-  selectedContent: ContentItem[];
+  selectedOptions: ContentItem[];
   onSelect: (selectedItems: ContentItem[]) => void;
   placeholder?: string;
   className?: string;
diff --git a/nkebao/src/components/ContentSelection/index.tsx b/nkebao/src/components/ContentSelection/index.tsx
index 9c022e805..c5d996e3c 100644
--- a/nkebao/src/components/ContentSelection/index.tsx
+++ b/nkebao/src/components/ContentSelection/index.tsx
@@ -34,7 +34,7 @@ const formatDate = (dateStr?: string) => {
 };
 
 export default function ContentSelection({
-  selectedContent,
+  selectedOptions,
   onSelect,
   placeholder = "选择内容库",
   className = "",
@@ -57,7 +57,7 @@ export default function ContentSelection({
   // 删除已选内容库
   const handleRemoveLibrary = (id: number) => {
     if (readonly) return;
-    onSelect(selectedContent.filter(c => c.id !== id));
+    onSelect(selectedOptions.filter(c => c.id !== id));
   };
 
   // 受控弹窗逻辑
@@ -120,22 +120,22 @@ export default function ContentSelection({
   // 处理内容库选择
   const handleLibraryToggle = (library: ContentItem) => {
     if (readonly) return;
-    const newSelected = selectedContent.some(c => c.id === library.id)
-      ? selectedContent.filter(c => c.id !== library.id)
-      : [...selectedContent, library];
+    const newSelected = selectedOptions.some(c => c.id === library.id)
+      ? selectedOptions.filter(c => c.id !== library.id)
+      : [...selectedOptions, library];
     onSelect(newSelected);
   };
 
   // 获取显示文本
   const getDisplayText = () => {
-    if (selectedContent.length === 0) return "";
-    return `已选择 ${selectedContent.length} 个内容库`;
+    if (selectedOptions.length === 0) return "";
+    return `已选择 ${selectedOptions.length} 个内容库`;
   };
 
   // 确认选择
   const handleConfirm = () => {
     if (onConfirm) {
-      onConfirm(selectedContent);
+      onConfirm(selectedOptions);
     }
     setRealVisible(false);
   };
@@ -161,7 +161,7 @@ export default function ContentSelection({
         </div>
       )}
       {/* 已选内容库列表窗口 */}
-      {showSelectedList && selectedContent.length > 0 && (
+      {showSelectedList && selectedOptions.length > 0 && (
         <div
           className={style.selectedListWindow}
           style={{
@@ -173,7 +173,7 @@ export default function ContentSelection({
             background: "#fff",
           }}
         >
-          {selectedContent.map(item => (
+          {selectedOptions.map(item => (
             <div
               key={item.id}
               className={style.selectedListRow}
@@ -243,7 +243,7 @@ export default function ContentSelection({
               currentPage={currentPage}
               totalPages={totalPages}
               loading={loading}
-              selectedCount={selectedContent.length}
+              selectedCount={selectedOptions.length}
               onPageChange={setCurrentPage}
               onCancel={() => setRealVisible(false)}
               onConfirm={handleConfirm}
@@ -260,7 +260,7 @@ export default function ContentSelection({
                 {libraries.map(item => (
                   <label key={item.id} className={style.libraryItem}>
                     <Checkbox
-                      checked={selectedContent.map(c => c.id).includes(item.id)}
+                      checked={selectedOptions.map(c => c.id).includes(item.id)}
                       onChange={() => !readonly && handleLibraryToggle(item)}
                       disabled={readonly}
                       className={style.checkboxWrapper}
diff --git a/nkebao/src/components/GroupSelection/data.ts b/nkebao/src/components/GroupSelection/data.ts
index 1bee00329..b042b6d35 100644
--- a/nkebao/src/components/GroupSelection/data.ts
+++ b/nkebao/src/components/GroupSelection/data.ts
@@ -25,7 +25,7 @@ export interface GroupSelectionItem {
 
 // 组件属性接口
 export interface GroupSelectionProps {
-  selectedGroups: GroupSelectionItem[];
+  selectedOptions: GroupSelectionItem[];
   onSelect: (groups: GroupSelectionItem[]) => void;
   onSelectDetail?: (groups: WechatGroup[]) => void;
   placeholder?: string;
diff --git a/nkebao/src/components/GroupSelection/index.tsx b/nkebao/src/components/GroupSelection/index.tsx
index decb8288f..fe1800549 100644
--- a/nkebao/src/components/GroupSelection/index.tsx
+++ b/nkebao/src/components/GroupSelection/index.tsx
@@ -6,7 +6,7 @@ import style from "./index.module.scss";
 import SelectionPopup from "./selectionPopup";
 import { GroupSelectionProps } from "./data";
 export default function GroupSelection({
-  selectedGroups,
+  selectedOptions,
   onSelect,
   onSelectDetail,
   placeholder = "选择群聊",
@@ -24,7 +24,7 @@ export default function GroupSelection({
   // 删除已选群聊
   const handleRemoveGroup = (id: string) => {
     if (readonly) return;
-    onSelect(selectedGroups.filter(g => g.id !== id));
+    onSelect(selectedOptions.filter(g => g.id !== id));
   };
 
   // 受控弹窗逻辑
@@ -42,8 +42,8 @@ export default function GroupSelection({
 
   // 获取显示文本
   const getDisplayText = () => {
-    if (selectedGroups.length === 0) return "";
-    return `已选择 ${selectedGroups.length} 个群聊`;
+    if (selectedOptions.length === 0) return "";
+    return `已选择 ${selectedOptions.length} 个群聊`;
   };
 
   return (
@@ -67,7 +67,7 @@ export default function GroupSelection({
         </div>
       )}
       {/* 已选群聊列表窗口 */}
-      {showSelectedList && selectedGroups.length > 0 && (
+      {showSelectedList && selectedOptions.length > 0 && (
         <div
           className={style.selectedListWindow}
           style={{
@@ -79,7 +79,7 @@ export default function GroupSelection({
             background: "#fff",
           }}
         >
-          {selectedGroups.map(group => (
+          {selectedOptions.map(group => (
             <div key={group.id} className={style.selectedListRow}>
               <div className={style.selectedListRowContent}>
                 <Avatar src={group.avatar} />
@@ -115,7 +115,7 @@ export default function GroupSelection({
       <SelectionPopup
         visible={realVisible}
         onVisibleChange={setRealVisible}
-        selectedGroups={selectedGroups}
+        selectedOptions={selectedOptions}
         onSelect={onSelect}
         onSelectDetail={onSelectDetail}
         readonly={readonly}
diff --git a/nkebao/src/pages/mobile/test/select.tsx b/nkebao/src/pages/mobile/test/select.tsx
index c4989299a..e71d6519e 100644
--- a/nkebao/src/pages/mobile/test/select.tsx
+++ b/nkebao/src/pages/mobile/test/select.tsx
@@ -58,7 +58,7 @@ const ComponentTest: React.FC = () => {
             <div style={{ padding: "16px 0" }}>
               <h3 style={{ marginBottom: 16 }}>ContentSelection 组件测试</h3>
               <ContentSelection
-                selectedContent={selectedContent}
+                selectedOptions={selectedContent}
                 onSelect={setSelectedContent}
                 placeholder="请选择内容库"
                 showSelectedList={true}
@@ -84,7 +84,7 @@ const ComponentTest: React.FC = () => {
             <div style={{ padding: "16px 0" }}>
               <h3 style={{ marginBottom: 16 }}>GroupSelection 组件测试</h3>
               <GroupSelection
-                selectedGroups={selectedGroups}
+                selectedOptions={selectedGroups}
                 onSelect={setSelectedGroups}
                 placeholder="请选择微信群组"
                 showSelectedList={true}