@@ -147,7 +163,7 @@ export default {
// issueTemplateId: [{required: true}],
},
screenHeight: 'calc(100vh - 195px)',
- labelWidth: '210px',
+ labelWidth: '150px',
platformOptions: [],
xpackEable: false
};
@@ -155,6 +171,10 @@ export default {
props: {
baseUrl: {
type: String
+ },
+ isShowApp: {
+ type: Boolean,
+ default: true
}
},
mounted() {
@@ -222,7 +242,7 @@ export default {
if (platforms.indexOf(platform) === -1) {
for (let i = 0; i < this.platformOptions.length; i++) {
if (this.platformOptions[i].value === platform) {
- this.platformOptions.splice(i, 1);
+ this.platformOptions.splice(1, i);
break;
}
}
@@ -278,8 +298,8 @@ export default {
removeGoBackListener(this.handleClose);
this.createVisible = false;
},
- chengeMockTcpSwitch(value){
- if(value && this.form.mockTcpPort === 0){
+ chengeMockTcpSwitch(value) {
+ if (value && this.form.mockTcpPort === 0) {
this.result = this.$get('/project/genTcpMockPort/' + this.form.id, res => {
let port = res.data;
this.form.mockTcpPort = port;
@@ -302,7 +322,7 @@ pre {
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
}
-.el-input,.el-textarea {
+.el-input, .el-textarea {
width: 80%;
}
diff --git a/frontend/src/business/components/project/menu/function/EditFunction.vue b/frontend/src/business/components/project/menu/function/EditFunction.vue
index 1040d4e343..91db34d387 100644
--- a/frontend/src/business/components/project/menu/function/EditFunction.vue
+++ b/frontend/src/business/components/project/menu/function/EditFunction.vue
@@ -331,6 +331,7 @@ export default {
.script-index {
margin-top: 10px;
+ width: 230px;
}
.show-menu {
diff --git a/frontend/src/business/components/settings/workspace/EditProject.vue b/frontend/src/business/components/settings/workspace/EditProject.vue
deleted file mode 100644
index f89f5c8eb1..0000000000
--- a/frontend/src/business/components/settings/workspace/EditProject.vue
+++ /dev/null
@@ -1,321 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
- 禅道流程：产品-项目 | 产品-迭代 | 产品-冲刺 | 项目-迭代 | 项目-冲刺
- 根据 "后台 -> 自定义 -> 流程" 查看对应流程，根据流程填写ID
- 产品-项目 | 产品-迭代 | 产品-冲刺 需要填写产品ID
- 项目-迭代 | 项目-冲刺 需要填写项目ID - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 06d431ec11..ce6ad55f9a 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -209,7 +209,7 @@ import {PROJECT_CONFIGS} from "@/business/components/common/components/search/se
import MsRolesTag from "@/business/components/common/components/MsRolesTag";
import AddMember from "@/business/components/settings/common/AddMember";
import MsInstructionsIcon from "@/business/components/common/components/MsInstructionsIcon";
-import EditProject from "@/business/components/settings/workspace/EditProject";
+import EditProject from "@/business/components/project/menu/EditProject";
export default {
name: "MsProject",
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index c20b465040..8ab60aa6fb 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1347,12 +1347,15 @@ export default {
clone: "Copy",
cant_reference: 'Historical test files, can be referenced after re-saving',
share_cookie: 'share cookie',
- module_id:'Scenario Module ID',
+ module_id: 'Scenario Module ID',
level: 'Level',
- version:"Scenario Version",
- warning_context:"It is not currently supported to add all scenarios to the test plan in batches!",
- jmx_file_set:"Scenario JMX file set",
- error_report_jmx:"Failed to export JMX file",
+ version: "Scenario Version",
+ warning_context: "It is not currently supported to add all scenarios to the test plan in batches!",
+ jmx_file_set: "Scenario JMX file set",
+ error_report_jmx: "Failed to export JMX file",
+ scenario_warning: "No other steps can be added to the referenced scenario steps and sub-steps",
+ scenario_step_warning: "No other steps can be added under the current step",
+ scenario_error: "Cannot reference or copy itself！",
},
request: {
debug: "Debug",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 5df1a32f2e..5a045c3d31 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1357,6 +1357,9 @@ export default {
warning_context: "暂不支持批量添加所有场景到测试计划!",
jmx_file_set: "场景JMX文件集",
error_report_jmx: "导出JMX文件失败",
+ scenario_warning: "引用的场景步骤及子步骤都无法添加其他步骤",
+ scenario_step_warning: "当前步骤下不能添加其他步骤",
+ scenario_error: "不能引用或复制自身！",
},
request: {
debug: "调试",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index c41bb21dbf..733955614f 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1357,6 +1357,9 @@ export default {
warning_context: "暫不支持批量添加所有場景到測試計劃!",
jmx_file_set: "場景JMX文件集",
error_report_jmx: "導出JMX文件失敗",
+ scenario_warning: "引用的場景步驟及子步驟都無法添加其他步驟",
+ scenario_step_warning: "當前步驟下不能添加其他步驟",
+ scenario_error: "不能引用或複製自身！",
},
request: {
debug: "調試",
-
- - 根据 "后台 -> 自定义 -> 流程" 查看对应流程，根据流程填写ID
- 产品-项目 | 产品-迭代 | 产品-冲刺 需要填写产品ID
- 项目-迭代 | 项目-冲刺 需要填写项目ID - -