From 43b1ab263bb5d5f12a2f1019c2adf11f307c506a Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Wed, 3 Apr 2024 15:52:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1038416 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038416 --bug=1038320 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038320 --bug=1037893 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037893 --bug=1037474 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037474 --bug=1037375 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037375 --bug=1037373 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037373 --- .../sdk/src/main/resources/i18n/commons.properties | 2 +- .../sdk/src/main/resources/i18n/commons_en_US.properties | 2 +- .../sdk/src/main/resources/i18n/commons_zh_CN.properties | 2 +- .../sdk/src/main/resources/i18n/commons_zh_TW.properties | 2 +- frontend/src/components/business/ms-params-input/index.vue | 2 +- .../views/api-test/components/requestComposition/index.vue | 4 +++- .../components/requestComposition/response/edit.vue | 4 ++-- .../api-test/management/components/management/api/index.vue | 2 +- .../management/components/management/api/preview/index.vue | 6 +++++- .../views/api-test/scenario/components/step/stepTree.vue | 2 +- frontend/src/views/api-test/scenario/index.vue | 4 ++-- .../caseManagementFeature/components/caseTemplateDetail.vue | 2 +- 12 files changed, 20 insertions(+), 14 deletions(-) diff --git a/backend/framework/sdk/src/main/resources/i18n/commons.properties b/backend/framework/sdk/src/main/resources/i18n/commons.properties index ab9034d97f..ce2509fced 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons.properties @@ -469,7 +469,7 @@ template.default=默认模板 parent.node.not_blank=父节点不能为空 node.not_blank=节点不能为空 -node.name.repeat=节点名称重复 +node.name.repeat=该层级已有此模块名称 project.cannot.match.parent=和父节点的项目无法匹配 set_default_template=设置默认模板 diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties index bcc8004eba..66ef9ba276 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties @@ -484,7 +484,7 @@ mock_environment_not_delete=Deletion is not allowed in the mock environment parent.node.not_blank=Parent node can not blank node.not_blank=Node can not blank -node.name.repeat=Name repeat +node.name.repeat=This module name already exists at this level project.cannot.match.parent=Project can not match parent # 状态流 diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties index 3b9a63051d..e48afd33db 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties @@ -479,7 +479,7 @@ global_parameters_already_exist=全局参数已存在 global_parameters_is_not_exist=全局参数不存在 parent.node.not_blank=父节点不能为空 node.not_blank=节点不能为空 -node.name.repeat=节点名称重复 +node.name.repeat=该层级已有此模块名称 project.cannot.match.parent=和父节点的项目无法匹配 api_test_environment_not_exist=环境不存在 mock_environment_not_delete=Mock环境不允许删除 diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties index f4bc0e233b..15f731fdf5 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties @@ -479,7 +479,7 @@ global_parameters_is_not_exist=全局參數不存在 parent.node.not_blank=父節點不能為空 node.not_blank=節點不能為空 -node.name.repeat=節點名稱重複 +node.name.repeat=此層級已有此模組名稱 project.cannot.match.parent=和父節點的項目無法匹配 api_test_environment_not_exist=環境不存在 mock_environment_not_delete=Mock 環境不允許刪除 diff --git a/frontend/src/components/business/ms-params-input/index.vue b/frontend/src/components/business/ms-params-input/index.vue index 950ecc17ee..7ab8e3a887 100644 --- a/frontend/src/components/business/ms-params-input/index.vue +++ b/frontend/src/components/business/ms-params-input/index.vue @@ -654,7 +654,7 @@ padding: 4px 8px; } } - max-width: 172px; + max-width: 400px; } .ms-params-input-setting-trigger { @apply bg-white; diff --git a/frontend/src/views/api-test/components/requestComposition/index.vue b/frontend/src/views/api-test/components/requestComposition/index.vue index 18429a5941..3e0990856b 100644 --- a/frontend/src/views/api-test/components/requestComposition/index.vue +++ b/frontend/src/views/api-test/components/requestComposition/index.vue @@ -1539,13 +1539,15 @@ emit('addDone'); done(true); Message.success(t('common.saveSuccess')); - saveCaseModalVisible.value = false; + handleSaveCaseCancel(); + saveCaseLoading.value = false; } } catch (error) { // eslint-disable-next-line no-console console.log(error); done(false); } finally { + handleSaveCaseCancel(); saveCaseLoading.value = false; } } else { diff --git a/frontend/src/views/api-test/components/requestComposition/response/edit.vue b/frontend/src/views/api-test/components/requestComposition/response/edit.vue index d9a29a8ac3..25a38fd7b0 100644 --- a/frontend/src/views/api-test/components/requestComposition/response/edit.vue +++ b/frontend/src/views/api-test/components/requestComposition/response/edit.vue @@ -269,8 +269,8 @@ addResponseTab({ ..._tab, id: new Date().getTime(), - label: `copy-${t(_tab.label || _tab.name)}`, - name: `copy-${t(_tab.label || _tab.name)}`, + label: `copy_${t(_tab.label || _tab.name)}`, + name: `copy_${t(_tab.label || _tab.name)}`, }); break; case 'delete': diff --git a/frontend/src/views/api-test/management/components/management/api/index.vue b/frontend/src/views/api-test/management/components/management/api/index.vue index 03d1171581..5aa325ba83 100644 --- a/frontend/src/views/api-test/management/components/management/api/index.vue +++ b/frontend/src/views/api-test/management/components/management/api/index.vue @@ -325,7 +325,7 @@ try { loading.value = true; const res = await getDefinitionDetail(typeof apiInfo === 'string' ? apiInfo : apiInfo.id); - const name = isCopy ? `copy-${res.name}` : res.name; + const name = isCopy ? `copy_${res.name}` : res.name; let parseRequestBodyResult; if (res.protocol === 'HTTP') { parseRequestBodyResult = parseRequestBodyFiles(res.request.body); // 解析请求体中的文件，将详情中的文件 id 集合收集，更新时以判断文件是否删除以及是否新上传的文件 diff --git a/frontend/src/views/api-test/management/components/management/api/preview/index.vue b/frontend/src/views/api-test/management/components/management/api/preview/index.vue index 1c6c74e67e..6d82c3d5e5 100644 --- a/frontend/src/views/api-test/management/components/management/api/preview/index.vue +++ b/frontend/src/views/api-test/management/components/management/api/preview/index.vue @@ -182,4 +182,8 @@ const activeKey = ref('detail'); - + diff --git a/frontend/src/views/api-test/scenario/components/step/stepTree.vue b/frontend/src/views/api-test/scenario/components/step/stepTree.vue index 98c8c22b41..250bf4550c 100644 --- a/frontend/src/views/api-test/scenario/components/step/stepTree.vue +++ b/frontend/src/views/api-test/scenario/components/step/stepTree.vue @@ -819,7 +819,7 @@ }; })[0] ), - name: `copy-${node.name}`, + name: `copy_${node.name}`, copyFromStepId: node.id, sort: node.sort + 1, isNew: true, diff --git a/frontend/src/views/api-test/scenario/index.vue b/frontend/src/views/api-test/scenario/index.vue index 84466184d9..036a04b02b 100644 --- a/frontend/src/views/api-test/scenario/index.vue +++ b/frontend/src/views/api-test/scenario/index.vue @@ -366,8 +366,8 @@ ...defaultScenarioInfo, steps: copySteps, id: isCopy ? getGenerateId() : defaultScenarioInfo.id || '', - label: isCopy ? `copy-${defaultScenarioInfo.name}` : defaultScenarioInfo.name, - name: isCopy ? `copy-${defaultScenarioInfo.name}` : defaultScenarioInfo.name, + label: isCopy ? `copy_${defaultScenarioInfo.name}` : defaultScenarioInfo.name, + name: isCopy ? `copy_${defaultScenarioInfo.name}` : defaultScenarioInfo.name, isNew: isCopy, stepResponses: {}, }); diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue index 3be1fd1cbe..75bf929968 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTemplateDetail.vue @@ -10,7 +10,7 @@ asterisk-position="end" >