Commit 9d44c2dd62e8b1825de3869b5d9e7840e70aac5d
Merge branch 'fix/DEFECT-1655' into 'main_dev'
fix: 修复报表选择设备名称过长无法选择属性 See merge request yunteng/thingskit-front!934
Showing
2 changed files
with
16 additions
and
8 deletions
| ... | ... | @@ -9,6 +9,7 @@ |
| 9 | 9 | @register="registerDrawer" |
| 10 | 10 | @ok="handleSubmit" |
| 11 | 11 | @close="handleClose" |
| 12 | + wrapClassName="report-drawer" | |
| 12 | 13 | > |
| 13 | 14 | <BasicForm @register="registerForm"> |
| 14 | 15 | <!-- 设备选择 --> |
| ... | ... | @@ -199,3 +200,15 @@ |
| 199 | 200 | selectDeviceRef.value?.resetValue(); |
| 200 | 201 | }; |
| 201 | 202 | </script> |
| 203 | + | |
| 204 | +<style lang="less"> | |
| 205 | + .report-drawer { | |
| 206 | + .ant-form-item-control-input-content { | |
| 207 | + > div { | |
| 208 | + > div { | |
| 209 | + @apply w-full; | |
| 210 | + } | |
| 211 | + } | |
| 212 | + } | |
| 213 | + } | |
| 214 | +</style> | ... | ... |
| 1 | 1 | <template> |
| 2 | - <div | |
| 3 | - class="flex" | |
| 4 | - v-for="param in dynamicInput.params" | |
| 5 | - :key="param.key" | |
| 6 | - style="margin-top: 1.25vh" | |
| 7 | - > | |
| 8 | - <a-input :disabled="true" v-model:value="param.name" style="width: 38%; margin-bottom: 5px" /> | |
| 2 | + <div v-for="param in dynamicInput.params" :key="param.key" class="mt-4 flex gap-2"> | |
| 3 | + <a-input :disabled="true" v-model:value="param.name" class="w-1/2 flex-1" /> | |
| 9 | 4 | <Select |
| 10 | 5 | placeholder="请选择设备属性" |
| 11 | 6 | v-model:value="param.attributes" |
| 12 | - style="width: 38%; margin-left: 1.8vw" | |
| 7 | + class="!w-1/2" | |
| 13 | 8 | :options="selectOptions" |
| 14 | 9 | :disabled="disabled" |
| 15 | 10 | @change="emitChange" | ... | ... |