Merge branch 'master' of https://github.com/metersphere/metersphere
This commit is contained in:
commit
b532d7a2de
|
@ -18,9 +18,9 @@
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="20" class="script-content">
|
<el-col :span="20" class="script-content">
|
||||||
<ms-code-edit v-if="isCodeEditAlive" :mode="jsr223ProcessorData.scriptLanguage"
|
<ms-code-edit v-if="isCodeEditAlive" :mode="codeEditModeMap[jsr223ProcessorData.scriptLanguage]"
|
||||||
:read-only="isReadOnly"
|
:read-only="isReadOnly"
|
||||||
:data.sync="jsr223ProcessorData.script" theme="eclipse" :modes="[]"
|
:data.sync="jsr223ProcessorData.script" theme="eclipse" :modes="['java','python']"
|
||||||
ref="codeEdit"/>
|
ref="codeEdit"/>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4" class="script-index">
|
<el-col :span="4" class="script-index">
|
||||||
|
@ -81,11 +81,12 @@
|
||||||
],
|
],
|
||||||
isCodeEditAlive: true,
|
isCodeEditAlive: true,
|
||||||
languages: [
|
languages: [
|
||||||
'beanshell', "python"
|
'beanshell', "python", "groovy"
|
||||||
],
|
],
|
||||||
codeEditModeMap: {
|
codeEditModeMap: {
|
||||||
beanshell: 'beanshell',
|
beanshell: 'java',
|
||||||
python: 'python'
|
python: 'python',
|
||||||
|
groovy: 'java'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue