Commit 43f1eaa597d29e7f46a2a34ed5ab4d47821b54b6
Merge branch 'fix/linkedge/06-25' into 'main_dev'
perf: 云端环境中,场景联动中告警配置名称过长时,页面直接全部占满了,没有省略限制 See merge request yunteng/thingskit-front!1390
Showing
2 changed files
with
2 additions
and
1 deletions
@@ -162,6 +162,7 @@ | @@ -162,6 +162,7 @@ | ||
162 | avatar: stepRecord?.icon, | 162 | avatar: stepRecord?.icon, |
163 | ...DeviceStep1Ref.value?.devicePositionState, | 163 | ...DeviceStep1Ref.value?.devicePositionState, |
164 | }, | 164 | }, |
165 | + alarmStatus: currentDeviceData?.alarmStatus, | ||
165 | }; | 166 | }; |
166 | validateNameLength(stepRecord.name); | 167 | validateNameLength(stepRecord.name); |
167 | if (Reflect.has(editData, 'deleteUrl')) { | 168 | if (Reflect.has(editData, 'deleteUrl')) { |
@@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
21 | 21 | ||
22 | <template> | 22 | <template> |
23 | <section> | 23 | <section> |
24 | - <ApiSelect v-bind="$attrs"> | 24 | + <ApiSelect class="!w-56" v-bind="$attrs"> |
25 | <template #dropdownRender="{ menuNode }"> | 25 | <template #dropdownRender="{ menuNode }"> |
26 | <Options :menuNode="menuNode" /> | 26 | <Options :menuNode="menuNode" /> |
27 | <Divider class="!my-2" /> | 27 | <Divider class="!my-2" /> |