Commit fa6f0682198990edd5a627ad1305d6633101589a

Authored by xp.Huang
2 parents f77f5c45 7d5f9c62

Merge branch 'fix/DEFECT-1378' into 'main_dev'

fix: 修复TCP设备切换未控制组件时丢失参数

See merge request yunteng/thingskit-front!683
@@ -42,10 +42,10 @@ @@ -42,10 +42,10 @@
42 const { customCommand } = record; 42 const { customCommand } = record;
43 return setFieldsValue({ 43 return setFieldsValue({
44 ...record, 44 ...record,
45 - transportType: customCommand?.transportType,  
46 - service: customCommand?.service,  
47 - command: customCommand?.command,  
48 - commandType: customCommand?.commandType, 45 + transportType: customCommand?.transportType || (record as Recordable).transportType,
  46 + service: customCommand?.service || (record as Recordable).service,
  47 + command: customCommand?.command || (record as Recordable).command,
  48 + commandType: customCommand?.commandType || (record as Recordable).commandType,
49 } as unknown as Partial<CommonDataSourceBindValueType>); 49 } as unknown as Partial<CommonDataSourceBindValueType>);
50 }; 50 };
51 51
@@ -42,10 +42,10 @@ @@ -42,10 +42,10 @@
42 const { customCommand } = record; 42 const { customCommand } = record;
43 return setFieldsValue({ 43 return setFieldsValue({
44 ...record, 44 ...record,
45 - transportType: customCommand?.transportType,  
46 - service: customCommand?.service,  
47 - command: customCommand?.command,  
48 - commandType: customCommand?.commandType, 45 + transportType: customCommand?.transportType || (record as Recordable).transportType,
  46 + service: customCommand?.service || (record as Recordable).service,
  47 + command: customCommand?.command || (record as Recordable).command,
  48 + commandType: customCommand?.commandType || (record as Recordable).commandType,
49 } as unknown as Partial<CommonDataSourceBindValueType>); 49 } as unknown as Partial<CommonDataSourceBindValueType>);
50 }; 50 };
51 51
@@ -42,10 +42,10 @@ @@ -42,10 +42,10 @@
42 const { customCommand } = record; 42 const { customCommand } = record;
43 return setFieldsValue({ 43 return setFieldsValue({
44 ...record, 44 ...record,
45 - transportType: customCommand?.transportType,  
46 - service: customCommand?.service,  
47 - command: customCommand?.command,  
48 - commandType: customCommand?.commandType, 45 + transportType: customCommand?.transportType || (record as Recordable).transportType,
  46 + service: customCommand?.service || (record as Recordable).service,
  47 + command: customCommand?.command || (record as Recordable).command,
  48 + commandType: customCommand?.commandType || (record as Recordable).commandType,
49 } as unknown as Partial<CommonDataSourceBindValueType>); 49 } as unknown as Partial<CommonDataSourceBindValueType>);
50 }; 50 };
51 51