Commit 04568e8fad5f072bc311ea42e450e58568ac031e
Merge branch 'fix/DEFECT-1748' into 'main_dev'
fix: 修复场景联动选择框上下移动时会跟随移动,固定位置 See merge request yunteng/thingskit-front!1003
Showing
2 changed files
with
6 additions
and
1 deletions
@@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
37 | /> | 37 | /> |
38 | </template> | 38 | </template> |
39 | <template #time="{ model, field }"> | 39 | <template #time="{ model, field }"> |
40 | - <Input v-model:value="model[field]" placeholder="请输入持续时间"> | 40 | + <Input v-model:value="model[field]" :disabled="disabled" placeholder="请输入持续时间"> |
41 | <template #addonAfter> | 41 | <template #addonAfter> |
42 | <Select | 42 | <Select |
43 | :disabled="disabled" | 43 | :disabled="disabled" |
@@ -18,6 +18,11 @@ | @@ -18,6 +18,11 @@ | ||
18 | v-model:value="model[field]" | 18 | v-model:value="model[field]" |
19 | @change="changeOutTarget" | 19 | @change="changeOutTarget" |
20 | @dropdown-visible-change="handleDropdownVisibleChange" | 20 | @dropdown-visible-change="handleDropdownVisibleChange" |
21 | + :getPopupContainer=" | ||
22 | + (triggerNode) => { | ||
23 | + return triggerNode.parentNode; | ||
24 | + } | ||
25 | + " | ||
21 | placeholder="请选择执行动作" | 26 | placeholder="请选择执行动作" |
22 | allowClear | 27 | allowClear |
23 | /> | 28 | /> |