Commit 65c2650e2ef9c9a20df3907d0419989d3fe6f139
1 parent
2aca4b34
fix: DEFECT-818 script test happend error but ascension success
Showing
2 changed files
with
8 additions
and
5 deletions
@@ -4,12 +4,12 @@ | @@ -4,12 +4,12 @@ | ||
4 | ref="formRef" | 4 | ref="formRef" |
5 | :model="scriptForm" | 5 | :model="scriptForm" |
6 | name="basic" | 6 | name="basic" |
7 | - :label-col="{ span: 3 }" | ||
8 | - :wrapper-col="{ span: 17 }" | 7 | + :label-col="{ span: 4 }" |
8 | + :wrapper-col="{ span: 16 }" | ||
9 | autocomplete="off" | 9 | autocomplete="off" |
10 | > | 10 | > |
11 | <a-form-item | 11 | <a-form-item |
12 | - :label="ifAdd ? '名称' : '输入参数'" | 12 | + :label="ifAdd ? '名称' : '输入参数(params)'" |
13 | :name="ifAdd ? 'name' : 'params'" | 13 | :name="ifAdd ? 'name' : 'params'" |
14 | :rules="[{ required: true, message: ifAdd ? '请输入脚本名称' : '请输入参数' }]" | 14 | :rules="[{ required: true, message: ifAdd ? '请输入脚本名称' : '请输入参数' }]" |
15 | > | 15 | > |
@@ -42,7 +42,10 @@ | @@ -42,7 +42,10 @@ | ||
42 | copy | 42 | copy |
43 | </Button> | 43 | </Button> |
44 | </a-form-item> | 44 | </a-form-item> |
45 | - <a-form-item :label="ifAdd ? '备注' : '输出参数'" :name="ifAdd ? 'description' : 'output'"> | 45 | + <a-form-item |
46 | + :label="ifAdd ? '备注' : '输出参数(output)'" | ||
47 | + :name="ifAdd ? 'description' : 'output'" | ||
48 | + > | ||
46 | <a-textarea | 49 | <a-textarea |
47 | :rows="3" | 50 | :rows="3" |
48 | v-if="ifAdd" | 51 | v-if="ifAdd" |
@@ -98,7 +98,7 @@ | @@ -98,7 +98,7 @@ | ||
98 | }, 10); | 98 | }, 10); |
99 | } else { | 99 | } else { |
100 | if (res) { | 100 | if (res) { |
101 | - converScriptRef.value?.setScriptOutputData(res?.output); | 101 | + converScriptRef.value?.setScriptOutputData(res?.output || res?.error); |
102 | } | 102 | } |
103 | } | 103 | } |
104 | emits('success', res); | 104 | emits('success', res); |