Merge branch 'develop' of https://e.coding.net/g-xtcy5189/cunkebao/cunkebao_v3 into develop

Cunkebao/src/components/DeviceSelection.tsx

@@ -120,7 +120,7 @@ export default function DeviceSelection({
 
       {/* 设备选择弹窗 */}
       <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
-        <DialogContent className="max-w-2xl max-h-[80vh] flex flex-col bg-white">
+        <DialogContent className="w-full h-full max-w-none max-h-none flex flex-col bg-white">
           <DialogHeader>
             <DialogTitle>选择设备</DialogTitle>
           </DialogHeader>
@@ -146,7 +146,7 @@ export default function DeviceSelection({
             </select>
           </div>
 
-          <ScrollArea className="flex-1 -mx-6 px-6 h-80 overflow-y-auto">
+          <div className="flex-1 overflow-y-auto">
             {loading ? (
               <div className="flex items-center justify-center h-full">
                 <div className="text-gray-500">加载中...</div>
@@ -185,7 +185,7 @@ export default function DeviceSelection({
                 ))}
               </div>
             )}
-          </ScrollArea>
+          </div>
 
           <div className="flex items-center justify-between pt-4 border-t">
             <div className="text-sm text-gray-500">

Cunkebao/src/components/DeviceSelectionDialog.tsx

@@ -122,7 +122,7 @@ export function DeviceSelectionDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="flex flex-col bg-white">
+      <DialogContent className="w-full h-full max-w-none max-h-none flex flex-col bg-white">
         <DialogHeader>
           <DialogTitle>选择设备</DialogTitle>
         </DialogHeader>
@@ -160,54 +160,52 @@ export function DeviceSelectionDialog({
           </Button>
         </div>
 
-        <div className="flex-1 overflow-y-auto -mx-6 px-6 max-h-[400px]">
-          <div className="space-y-2">
-            {loading ? (
-              <div className="flex items-center justify-center h-full text-gray-500">
-                加载中...
-              </div>
-            ) : filteredDevices.length === 0 ? (
-              <div className="flex items-center justify-center h-full text-gray-500">
-                暂无数据
-              </div>
-            ) : (
-              filteredDevices.map((device) => (
-                <label
-                  key={device.id}
-                  className="flex items-start space-x-3 p-4 rounded-lg hover:bg-gray-50 cursor-pointer border"
-                >
-                  <input
-                    type="checkbox"
-                    checked={selectedDevices.includes(device.id)}
-                    onChange={() => handleDeviceSelect(device.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">{device.name}</span>
-                      <Badge
-                        variant={
-                          device.status === "online" ? "default" : "secondary"
-                        }
-                      >
-                        {device.status === "online" ? "在线" : "离线"}
-                      </Badge>
-                    </div>
-                    <div className="text-sm text-gray-500 mt-1">
-                      <div>IMEI: {device.imei}</div>
-                      <div>微信号: {device.wxid || "-"}</div>
-                      <div>昵称: {device.nickname || "-"}</div>
-                    </div>
-                    {device.usedInPlans > 0 && (
-                      <div className="text-sm text-orange-500 mt-1">
-                        已用于 {device.usedInPlans} 个计划
-                      </div>
-                    )}
+        <div className="flex-1 overflow-y-auto">
+          {loading ? (
+            <div className="flex items-center justify-center h-full text-gray-500">
+              加载中...
+            </div>
+          ) : filteredDevices.length === 0 ? (
+            <div className="flex items-center justify-center h-full text-gray-500">
+              暂无数据
+            </div>
+          ) : (
+            filteredDevices.map((device) => (
+              <label
+                key={device.id}
+                className="flex items-start space-x-3 p-4 rounded-lg hover:bg-gray-50 cursor-pointer border"
+              >
+                <input
+                  type="checkbox"
+                  checked={selectedDevices.includes(device.id)}
+                  onChange={() => handleDeviceSelect(device.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">{device.name}</span>
+                    <Badge
+                      variant={
+                        device.status === "online" ? "default" : "secondary"
+                      }
+                    >
+                      {device.status === "online" ? "在线" : "离线"}
+                    </Badge>
                   </div>
-                </label>
-              ))
-            )}
-          </div>
+                  <div className="text-sm text-gray-500 mt-1">
+                    <div>IMEI: {device.imei}</div>
+                    <div>微信号: {device.wxid || "-"}</div>
+                    <div>昵称: {device.nickname || "-"}</div>
+                  </div>
+                  {device.usedInPlans > 0 && (
+                    <div className="text-sm text-orange-500 mt-1">
+                      已用于 {device.usedInPlans} 个计划
+                    </div>
+                  )}
+                </div>
+              </label>
+            ))
+          )}
         </div>
 
         <div className="flex justify-between items-center mt-4 pt-4 border-t">

Cunkebao/src/components/FriendSelection.tsx

@@ -229,7 +229,7 @@ export default function FriendSelection({
 
       {/* 微信好友选择弹窗 */}
       <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
-        <DialogContent className="max-w-xl max-h-[90vh] flex flex-col p-0 gap-0 overflow-hidden bg-white">
+        <DialogContent className="w-full h-full max-w-none max-h-none flex flex-col p-0 gap-0 overflow-hidden bg-white">
           <div className="p-6">
             <DialogTitle className="text-center text-xl font-medium mb-6">
               选择微信好友
@@ -256,7 +256,7 @@ export default function FriendSelection({
             </div>
           </div>
 
-          <div className="flex-1 overflow-y-auto h-[50vh]">
+          <div className="flex-1 overflow-y-auto">
             {loading ? (
               <div className="flex items-center justify-center h-full">
                 <div className="text-gray-500">加载中...</div>

Cunkebao/src/components/GroupSelection.tsx

@@ -193,7 +193,7 @@ export default function GroupSelection({
 
       {/* 群组选择弹窗 */}
       <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
-        <DialogContent className="max-w-xl max-h-[90vh] flex flex-col p-0 gap-0 overflow-hidden  bg-white">
+        <DialogContent className="w-full h-full max-w-none max-h-none flex flex-col p-0 gap-0 overflow-hidden bg-white">
           <div className="p-6">
             <DialogTitle className="text-center text-xl font-medium mb-6">
               选择群聊
@@ -219,7 +219,7 @@ export default function GroupSelection({
             </div>
           </div>
 
-          <div className="flex-1 overflow-y-auto h-[50vh]">
+          <div className="flex-1 overflow-y-auto">
             {loading ? (
               <div className="flex items-center justify-center h-full">
                 <div className="text-gray-500">加载中...</div>