Commit 3e9658c85232fe6900f76efa51f124956da5bafa
1 parent
f98f745f
fix: DEFECT-1619 新增里面的测试和启用后的测试转换脚本时,如果该脚本为上行解析,则设备鉴权不可点击,反之则一样
Showing
2 changed files
with
16 additions
and
2 deletions
@@ -114,7 +114,7 @@ | @@ -114,7 +114,7 @@ | ||
114 | </div> | 114 | </div> |
115 | </template> | 115 | </template> |
116 | <script setup lang="ts"> | 116 | <script setup lang="ts"> |
117 | - import { ref, unref, reactive, onMounted, toRefs, computed } from 'vue'; | 117 | + import { ref, unref, reactive, onMounted, toRefs, computed, nextTick } from 'vue'; |
118 | import ace from 'ace-builds'; | 118 | import ace from 'ace-builds'; |
119 | import { Card, Button, Tooltip } from 'ant-design-vue'; | 119 | import { Card, Button, Tooltip } from 'ant-design-vue'; |
120 | import 'ace-builds/src-noconflict/theme-chrome'; // 默认设置的主题 | 120 | import 'ace-builds/src-noconflict/theme-chrome'; // 默认设置的主题 |
@@ -323,6 +323,18 @@ | @@ -323,6 +323,18 @@ | ||
323 | }; | 323 | }; |
324 | 324 | ||
325 | const setDisableRadio = (value) => { | 325 | const setDisableRadio = (value) => { |
326 | + //查看和表格里面的测试点击禁用脚本类型 | ||
327 | + unref(reportTypeOptions.scriptTypeOptions).forEach((item: any) => { | ||
328 | + if (item.value === value) item.disabled = false; | ||
329 | + else item.disabled = true; | ||
330 | + }); | ||
331 | + }; | ||
332 | + | ||
333 | + const setDisableTestRadio = async (value) => { | ||
334 | + //内部弹窗,使用上面的setDisableRadio无效 | ||
335 | + //新增里面的测试点击禁用脚本类型 | ||
336 | + await getScriptType(); | ||
337 | + await nextTick(); | ||
326 | unref(reportTypeOptions.scriptTypeOptions).forEach((item: any) => { | 338 | unref(reportTypeOptions.scriptTypeOptions).forEach((item: any) => { |
327 | if (item.value === value) item.disabled = false; | 339 | if (item.value === value) item.disabled = false; |
328 | else item.disabled = true; | 340 | else item.disabled = true; |
@@ -336,6 +348,7 @@ | @@ -336,6 +348,7 @@ | ||
336 | setScriptOutputData, | 348 | setScriptOutputData, |
337 | setDefaultRadio, | 349 | setDefaultRadio, |
338 | setDisableRadio, | 350 | setDisableRadio, |
351 | + setDisableTestRadio, | ||
339 | }); | 352 | }); |
340 | </script> | 353 | </script> |
341 | <style lang="less" scoped> | 354 | <style lang="less" scoped> |
@@ -61,8 +61,9 @@ | @@ -61,8 +61,9 @@ | ||
61 | converScriptFormRef.value?.setDisableRadio(data.record.scriptType); | 61 | converScriptFormRef.value?.setDisableRadio(data.record.scriptType); |
62 | } | 62 | } |
63 | } else { | 63 | } else { |
64 | - //从新增页面里点击的测试 | 64 | + //从新增页面里点击的测试,禁用脚本类型 |
65 | converScriptFormRef.value?.setFormData(data.record); | 65 | converScriptFormRef.value?.setFormData(data.record); |
66 | + converScriptFormRef.value?.setDisableTestRadio(data.record.scriptType); | ||
66 | } | 67 | } |
67 | if (data.scriptType) { | 68 | if (data.scriptType) { |
68 | converScriptFormRef.value?.setDisableRadio(data.scriptType); | 69 | converScriptFormRef.value?.setDisableRadio(data.scriptType); |