+
{{ $t("run_mode.title") }}：
{{ $t("run_mode.serial") }}
@@ -145,7 +132,6 @@ import CrontabResult from "@/business/components/common/cron/CrontabResult";
import {cronValidate} from "@/common/js/cron";
import MsScheduleNotification from "./ScheduleNotification";
import ScheduleSwitch from "@/business/components/api/automation/schedule/ScheduleSwitch";
-import EnvPopover from "@/business/components/api/automation/scenario/EnvPopover";
import {ENV_TYPE} from "@/common/js/constants";
function defaultCustomValidate() {
@@ -164,7 +150,6 @@ export default {
Crontab,
MsScheduleNotification,
"NoticeTemplate": noticeTemplate.default,
- EnvPopover
},
props: {
@@ -234,8 +219,6 @@ export default {
onSampleError: false,
runWithinResourcePool: false,
resourcePoolId: null,
- envMap: new Map,
- environmentGroupId: "",
environmentType: ENV_TYPE.JSON
},
projectList: [],
@@ -319,7 +302,6 @@ export default {
listenGoBack(this.close);
this.activeName = 'first';
this.getResourcePools();
- this.getWsProjects();
this.runConfig.environmentType = ENV_TYPE.JSON;
},
findSchedule() {
@@ -330,9 +312,6 @@ export default {
this.schedule = response.data;
if (response.data.config) {
this.runConfig = JSON.parse(response.data.config);
- if (this.runConfig.envMap) {
- this.runConfig.envMap = objToStrMap(this.runConfig.envMap);
- }
}
} else {
this.schedule = {
@@ -457,41 +436,6 @@ export default {
this.runConfig.runWithinResourcePool = false;
this.runConfig.resourcePoolId = null;
},
- setProjectEnvMap(projectEnvMap) {
- this.runConfig.envMap = strMapToObj(projectEnvMap);
- },
- setEnvGroup(id) {
- this.runConfig.environmentGroupId = id;
- },
- getWsProjects() {
- this.$get("/project/getOwnerProjects", res => {
- this.projectList = res.data;
- })
- },
- showPopover() {
- this.projectIds.clear();
- let param = undefined;
- let url = "";
- if (this.type === 'apiCase') {
- url = '/test/plan/api/case/env';
- param = this.planCaseIds;
- } else if (this.type === 'apiScenario') {
- url = '/test/plan/api/scenario/env';
- param = this.planCaseIds;
- } else if (this.type === 'plan') {
- url = '/test/plan/case/env';
- param = {id: this.planId};
- }
- this.$post(url, param, res => {
- let data = res.data;
- if (data) {
- for (let d in data) {
- this.projectIds.add(d);
- }
- }
- this.$refs.envPopover.openEnvSelect();
- });
- }
},
computed: {
isTesterPermission() {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 8ee1df272a..813801b0e6 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 8ee1df272a1ba3ca6e8ab2ceca227cf1899ccce9
+Subproject commit 813801b0e68463394c67779853529a7da1c7fa22
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 7e0a5db422..d5472d9c6d 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -36,7 +36,7 @@ export default {
close_schedule: 'Close Schedule',
open_schedule: 'Start Schedule',
schedule_switch: 'Schedule Switch',
- schedule_cron_title: 'Schedule Time Expression',
+ schedule_cron_title: 'Cron Expression',
review_complete: 'Review Completed',
examples: 'examples',
help_documentation: 'Help',
@@ -45,8 +45,8 @@ export default {
delete_cancelled: 'Delete cancelled',
option_cannot_spread_pages: 'This options not support spread pages.Do you want continue?',
workspace: 'Workspace',
- space:'Space',
- current_workspace:"Current Workspace",
+ space: 'Space',
+ current_workspace: "Current Workspace",
organization: 'Organization',
setting: 'Setting',
project: 'Project',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 5598c12393..f51cdd3316 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -36,7 +36,7 @@ export default {
close_schedule: '关闭定时任务',
open_schedule: '开启定时任务',
schedule_switch: '定时任务开关',
- schedule_cron_title: '定时任务时间表达式',
+ schedule_cron_title: 'Cron表达式',
review_complete: '评审完成',
examples: '示例',
help_documentation: '帮助文档',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 1831ac2d2d..9cfb309a62 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -36,7 +36,7 @@ export default {
close_schedule: '關閉定時任務',
open_schedule: '開啟定時任務',
schedule_switch: '定時任務開關',
- schedule_cron_title: '定時任務時間運算式',
+ schedule_cron_title: 'Cron運算式',
review_complete: '評審完成',
examples: '示例',
help_documentation: '幫助文檔',
@@ -44,8 +44,8 @@ export default {
confirm_delete: '是否刪除',
delete_cancelled: '已取消刪除',
workspace: '工作空間',
- space:'空間',
- current_workspace:"當前工作空間",
+ space: '空間',
+ current_workspace: "當前工作空間",
organization: '組織',
setting: '設置',
project: '項目',