Commit 3afef58659c9b15e0b68805f93204220517d4533

Authored by ww
1 parent a573101e

fix: DEFECT-1245 修复任务中心选择设备回显设备别名

@@ -50,6 +50,7 @@ export interface DeviceModel { @@ -50,6 +50,7 @@ export interface DeviceModel {
50 deviceType: DeviceTypeEnum; 50 deviceType: DeviceTypeEnum;
51 organizationId: string; 51 organizationId: string;
52 customerId?: string; 52 customerId?: string;
  53 + alias?: string;
53 } 54 }
54 55
55 export interface DeviceProfileModel { 56 export interface DeviceProfileModel {
@@ -76,20 +76,25 @@ export const formSchemas: FormSchema[] = [ @@ -76,20 +76,25 @@ export const formSchemas: FormSchema[] = [
76 try { 76 try {
77 if (isDevices) { 77 if (isDevices) {
78 const result = await getDevicesByDeviceIds(data!); 78 const result = await getDevicesByDeviceIds(data!);
79 - return result.data; 79 + return result.data.map((item) => ({
  80 + label: item.alias || item.name,
  81 + value: 'tbDeviceId',
  82 + }));
80 } else { 83 } else {
81 - return await getMeetTheConditionsDevice({ 84 + const result = await getMeetTheConditionsDevice({
82 organizationId, 85 organizationId,
83 deviceProfileId: data![0], 86 deviceProfileId: data![0],
84 }); 87 });
  88 + return result.map((item) => ({
  89 + label: item.alias || item.name,
  90 + value: 'tbDeviceId',
  91 + }));
85 } 92 }
86 } catch (error) { 93 } catch (error) {
87 return []; 94 return [];
88 } 95 }
89 }, 96 },
90 mode: 'multiple', 97 mode: 'multiple',
91 - labelField: 'name',  
92 - valueField: 'tbDeviceId',  
93 ...createPickerSearch(), 98 ...createPickerSearch(),
94 placeholder: '请选择设备', 99 placeholder: '请选择设备',
95 getPopupContainer: () => document.body, 100 getPopupContainer: () => document.body,