From c88cfa3ad1365ddfbc1f45812dd95d92dbfed3b4 Mon Sep 17 00:00:00 2001 From: song-tianyang Date: Fri, 22 Mar 2024 16:33:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=89=8D=E5=90=8E=E7=BD=AE=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E8=84=9A=E6=9C=AC=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1037398 --user=宋天阳 【接口测试】定义-调试-后置-脚本操作默认语言不正确 https://www.tapd.cn/55049933/s/1479340 --- frontend/src/components/business/ms-assertion/index.vue | 4 ++-- frontend/src/views/api-test/components/condition/content.vue | 4 ++-- frontend/src/views/api-test/components/condition/index.vue | 4 ++-- .../scenario/components/common/scriptOperationDrawer.vue | 4 ++-- .../commonScript/components/scriptDetailDrawer.vue | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/business/ms-assertion/index.vue b/frontend/src/components/business/ms-assertion/index.vue index fc0256343f..6011019d09 100644 --- a/frontend/src/components/business/ms-assertion/index.vue +++ b/frontend/src/components/business/ms-assertion/index.vue @@ -343,13 +343,13 @@ enableCommonScript: false, script: '', scriptId: '', - scriptLanguage: LanguageEnum.BEANSHELL, + scriptLanguage: LanguageEnum.BEANSHELL_JSR233, commonScriptInfo: { id: '', name: '', script: '', params: [{}], - scriptLanguage: LanguageEnum.BEANSHELL, + scriptLanguage: LanguageEnum.BEANSHELL_JSR233, }, }); break; diff --git a/frontend/src/views/api-test/components/condition/content.vue b/frontend/src/views/api-test/components/condition/content.vue index da8a1523f0..a83af31a7a 100644 --- a/frontend/src/views/api-test/components/condition/content.vue +++ b/frontend/src/views/api-test/components/condition/content.vue @@ -112,7 +112,7 @@ v-model:model-value="scriptEx" class="flex-1" theme="vs" - :language="LanguageEnum.BEANSHELL" + :language="LanguageEnum.BEANSHELL_JSR233" width="500px" height="388px" :show-full-screen="false" @@ -215,7 +215,7 @@ v-model:model-value="condition.commonScriptInfo.script" theme="vs" height="100%" - :language="condition.commonScriptInfo.scriptLanguage || LanguageEnum.BEANSHELL" + :language="condition.commonScriptInfo.scriptLanguage || LanguageEnum.BEANSHELL_JSR233" :show-full-screen="false" :show-theme-change="false" read-only diff --git a/frontend/src/views/api-test/components/condition/index.vue b/frontend/src/views/api-test/components/condition/index.vue index b1ce73dd16..51f7add901 100644 --- a/frontend/src/views/api-test/components/condition/index.vue +++ b/frontend/src/views/api-test/components/condition/index.vue @@ -145,13 +145,13 @@ enable: true, script: '', scriptId: '', - scriptLanguage: LanguageEnum.BEANSHELL, + scriptLanguage: LanguageEnum.BEANSHELL_JSR233, commonScriptInfo: { id: '', name: '', script: '', params: [], - scriptLanguage: LanguageEnum.BEANSHELL, + scriptLanguage: LanguageEnum.BEANSHELL_JSR233, }, }); diff --git a/frontend/src/views/api-test/scenario/components/common/scriptOperationDrawer.vue b/frontend/src/views/api-test/scenario/components/common/scriptOperationDrawer.vue index 32b7025d6e..8f3eb66527 100644 --- a/frontend/src/views/api-test/scenario/components/common/scriptOperationDrawer.vue +++ b/frontend/src/views/api-test/scenario/components/common/scriptOperationDrawer.vue @@ -54,7 +54,7 @@ processorType: RequestConditionProcessor.SCRIPT, enableCommonScript: false, script: '', - scriptLanguage: LanguageEnum.BEANSHELL, + scriptLanguage: LanguageEnum.BEANSHELL_JSR233, commonScriptInfo: {}, } as ExecuteConditionProcessor; const scriptName = ref(props.name || ''); @@ -74,7 +74,7 @@ processorType: RequestConditionProcessor.SCRIPT, enableCommonScript: false, script: '', - scriptLanguage: LanguageEnum.BEANSHELL, + scriptLanguage: LanguageEnum.BEANSHELL_JSR233, commonScriptInfo: {}, } as ExecuteConditionProcessor; } diff --git a/frontend/src/views/project-management/commonScript/components/scriptDetailDrawer.vue b/frontend/src/views/project-management/commonScript/components/scriptDetailDrawer.vue index 3d83a1a27b..d970daeec7 100644 --- a/frontend/src/views/project-management/commonScript/components/scriptDetailDrawer.vue +++ b/frontend/src/views/project-management/commonScript/components/scriptDetailDrawer.vue @@ -224,7 +224,7 @@ projectId: '', params: '', script: '', - type: LanguageEnum.BEANSHELL, + type: LanguageEnum.BEANSHELL_JSR233, result: '', };