siyu-bank/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备memo字段未设置时显示为未命名设备

Browse Source
This commit is contained in:
柳清爽
2025-04-16 14:02:50 +08:00
parent 6dcc78153a
commit 2891a40dc4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cunkebao/app/components/device-selection-dialog.tsx
View File

@@ -269,7 +269,7 @@ export function DeviceSelectionDialog({
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0">
<div className="flex items-center justify-between mb-1"> <div className="flex items-center justify-between mb-1">
<label htmlFor={`device-${device.id}`} className="font-medium truncate cursor-pointer"> <label htmlFor={`device-${device.id}`} className="font-medium truncate cursor-pointer">
{device.name} {device.name || "未命名设备"}
</label> </label>
<div <div
className={`px-2 py-1 rounded-full text-xs ${ className={`px-2 py-1 rounded-full text-xs ${

2
Cunkebao/app/devices/page.tsx
View File

@@ -605,7 +605,7 @@ export default function DevicesPage() {
/> />
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0">
<div className="flex items-center justify-between mb-1"> <div className="flex items-center justify-between mb-1">
<div className="font-medium truncate">{device.memo}</div> <div className="font-medium truncate">{device.memo || "未命名设备"}</div>
<Badge variant={device.status === "online" ? "default" : "secondary"} className="ml-2"> <Badge variant={device.status === "online" ? "default" : "secondary"} className="ml-2">
{device.status === "online" ? "在线" : "离线"} {device.status === "online" ? "在线" : "离线"}
</Badge> </Badge>

2
Cunkebao/app/workspace/moments-sync/components/device-selection-dialog.tsx
View File

@@ -60,7 +60,7 @@ export function DeviceSelectionDialog({ open, onOpenChange, selectedDevices, onS
if (response.code === 200 && response.data.list) { if (response.code === 200 && response.data.list) {
const transformedDevices: Device[] = response.data.list.map(device => ({ const transformedDevices: Device[] = response.data.list.map(device => ({
id: device.id, id: device.id,
name: device.memo || device.imei || '', name: device.memo || "未命名设备",
imei: device.imei || '', imei: device.imei || '',
wxid: device.wechatId || '', wxid: device.wechatId || '',
status: device.alive === 1 ? "online" : "offline", status: device.alive === 1 ? "online" : "offline",