Commit 094e646b8aec968fd006fb50916ec2563a4aadc9

Authored by xp.Huang
2 parents 2d4e8f73 fc94a5f6

Merge branch 'fix/device-code' into 'main_dev'

fix: 修复创建设备时地址码未保存

See merge request yunteng/thingskit-front!1266
@@ -165,6 +165,14 @@ @@ -165,6 +165,14 @@
165 values.icon = file.url || null; 165 values.icon = file.url || null;
166 } 166 }
167 values = { ...positionState, ...values }; 167 values = { ...positionState, ...values };
  168 +
  169 + Object.assign(values, {
  170 + code:
  171 + values?.tcpDeviceProtocol === TCPProtocolTypeEnum.CUSTOM
  172 + ? values?.code
  173 + : values?.addressCode,
  174 + });
  175 +
168 delete values.deviceAddress; 176 delete values.deviceAddress;
169 emit('next', values); 177 emit('next', values);
170 // 获取输入的数据 178 // 获取输入的数据
@@ -419,6 +427,7 @@ @@ -419,6 +427,7 @@
419 const file = (value.icon || []).at(0) || {}; 427 const file = (value.icon || []).at(0) || {};
420 value.icon = file.url || null; 428 value.icon = file.url || null;
421 } 429 }
  430 +
422 return { 431 return {
423 ...value, 432 ...value,
424 ...(value?.code || value?.addressCode 433 ...(value?.code || value?.addressCode