From c04aeae9df352d2a823e8aa7655d958448329269 Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Wed, 27 Jan 2021 18:19:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E5=BC=B9=E6=A1=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/definition/components/basis/SetEnvironment.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue b/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue index 7d178b58f7..2abc7a3191 100644 --- a/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue +++ b/frontend/src/business/components/api/definition/components/basis/SetEnvironment.vue @@ -3,7 +3,7 @@ From ac95fca6fea171fe267d74cee8a98d1d646ee85e Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Wed, 27 Jan 2021 18:34:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?refactor:=20=E8=AE=A4=E8=AF=81=E6=BA=90?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/settings/system/SystemParameterSetting.vue | 2 +- frontend/src/i18n/en-US.js | 3 ++- frontend/src/i18n/zh-CN.js | 3 ++- frontend/src/i18n/zh-TW.js | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/business/components/settings/system/SystemParameterSetting.vue b/frontend/src/business/components/settings/system/SystemParameterSetting.vue index 904593e411..40decd2c3a 100644 --- a/frontend/src/business/components/settings/system/SystemParameterSetting.vue +++ b/frontend/src/business/components/settings/system/SystemParameterSetting.vue @@ -14,7 +14,7 @@ - + diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 69fd212621..f748dc4f1e 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -1501,6 +1501,7 @@ export default { format: "Output format", }, auth_source: { - delete_prompt: 'This operation will delete the authentication source, do you want to continue? ' + delete_prompt: 'This operation will delete the authentication source, do you want to continue? ', + title: 'Auth Source' } }; diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 1b3830c336..5d2cb4c6fa 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -1504,6 +1504,7 @@ export default { format: "输出格式", }, auth_source: { - delete_prompt: '此操作会删除认证源，是否继续？' + delete_prompt: '此操作会删除认证源，是否继续？', + title: '认证设置' } }; diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index fd694cfe3a..a9db8d01a5 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -1502,6 +1502,7 @@ export default { format: "輸出格式", }, auth_source: { - delete_prompt: '此操作會刪除認證源，是否繼續？ ' + delete_prompt: '此操作會刪除認證源，是否繼續？ ', + title: '認證設置' } }; From 6bdc3a7c21f7ac38ae775d1ce00a9d38332bb64e Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Wed, 27 Jan 2021 18:54:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V69__swagger_url_project.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/main/resources/db/migration/V69__swagger_url_project.sql b/backend/src/main/resources/db/migration/V69__swagger_url_project.sql index db6cb0d5c4..1967c41cbb 100644 --- a/backend/src/main/resources/db/migration/V69__swagger_url_project.sql +++ b/backend/src/main/resources/db/migration/V69__swagger_url_project.sql @@ -1,11 +1,11 @@ create table swagger_url_project ( - id varchar(255) not null, - project_id varchar(255) null, + id varchar(30) not null, + project_id varchar(30) null, swagger_url varchar(255) null, - module_id varchar(255) null, + module_id varchar(30) null, module_path varchar(255) null, - mode_id varchar(255) null, + mode_id varchar(30) null, primary key (id) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4; From 137d714003989369480803022e3d31c101f1145f Mon Sep 17 00:00:00 2001 From: "song.tianyang" Date: Wed, 27 Jan 2021 19:13:27 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E8=AE=BE=E7=BD=AE=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=9A=84=E5=BC=B9=E7=AA=97=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=BB=91=E5=8A=A8=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 设置定时任务的弹窗中增加滑动开关 --- .../automation/schedule/ScheduleMaintain.vue | 56 +++++++++++-- .../automation/schedule/ScheduleSwitch.vue | 82 +++++++++++++++++++ 2 files changed, 131 insertions(+), 7 deletions(-) create mode 100644 frontend/src/business/components/api/automation/schedule/ScheduleSwitch.vue diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue index b0ff4810af..9e151962c5 100644 --- a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue +++ b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue @@ -8,12 +8,22 @@ - - {{ - $t('commons.save') - }} - + + + + {{ + $t('commons.save') + }} + + + + + + + + + @@ -44,6 +54,7 @@ import Crontab from "@/business/components/common/cron/Crontab"; 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"; function defaultCustomValidate() { return {pass: true}; @@ -55,7 +66,7 @@ const noticeTemplate = requireComponent.keys().length > 0 ? requireComponent("./ export default { name: "MsScheduleMaintain", - components: {CrontabResult, Crontab, MsScheduleNotification, "NoticeTemplate": noticeTemplate.default}, + components: {CrontabResult, ScheduleSwitch,Crontab, MsScheduleNotification, "NoticeTemplate": noticeTemplate.default}, props: { customValidate: { @@ -100,6 +111,7 @@ export default { form: { cronValue: "" }, + paramRow:{}, activeName: 'first', rules: { cronValue: [{required: true, validator: validateCron, trigger: 'blur'}], @@ -110,6 +122,35 @@ export default { currentUser: () => { return getCurrentUser(); }, + scheduleChange(){ + let flag = this.schedule.enable; + this.$confirm(this.$t('api_test.home_page.running_task_list.confirm.close_title'), this.$t('commons.prompt'), { + confirmButtonText: this.$t('commons.confirm'), + cancelButtonText: this.$t('commons.cancel'), + type: 'warning' + }).then(() => { + let param = {}; + param.taskID = this.schedule.id; + param.enable = flag; + this.updateTask(param); + }).catch(() => { + }); + + }, + updateTask(param){ + this.result = this.$post('/api/schedule/updateEnableByPrimyKey', param, response => { + let paramTestId = ""; + if (this.paramRow.redirectFrom == 'testPlan') { + paramTestId = this.paramRow.id; + this.scheduleTaskType = "TEST_PLAN_TEST"; + } else { + paramTestId = this.paramRow.id; + this.scheduleTaskType = "API_SCENARIO_TEST"; + } + this.taskID = paramTestId; + this.findSchedule(paramTestId); + }); + }, initUserList() { let param = { name: '', @@ -132,6 +173,7 @@ export default { open(row) { //测试计划页面跳转来的 let paramTestId = ""; + this.paramRow = row; if (row.redirectFrom == 'testPlan') { paramTestId = row.id; this.scheduleTaskType = "TEST_PLAN_TEST"; diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleSwitch.vue b/frontend/src/business/components/api/automation/schedule/ScheduleSwitch.vue new file mode 100644 index 0000000000..9f2f140d5b --- /dev/null +++ b/frontend/src/business/components/api/automation/schedule/ScheduleSwitch.vue @@ -0,0 +1,82 @@ + + + + + From 00a382b73657d9d58d57c2499754a6059f41d16d Mon Sep 17 00:00:00 2001 From: Coooder-X <55648333+Coooder-X@users.noreply.github.com> Date: Wed, 27 Jan 2021 19:20:45 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20(=E6=8E=A5=E5=8F=A3=E5=AE=9A?= =?UTF-8?q?=E4=B9=89)=20=E8=A7=A3=E5=86=B3=E5=9C=A8=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E7=AB=99=E4=B8=AD=EF=BC=8CCase=E5=88=87=E6=8D=A2=E5=88=B0Api?= =?UTF-8?q?=E6=97=B6=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=9B=9E=E6=94=B6=E7=AB=99?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=97=AE=E9=A2=98=20(#1271)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/api/definition/components/list/ApiList.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue index 837f51cffd..e7abd10448 100644 --- a/frontend/src/business/components/api/definition/components/list/ApiList.vue +++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue @@ -274,7 +274,12 @@ }, }, created: function () { - this.condition.filters = {status: ["Prepare", "Underway", "Completed"]}; + if (this.trashEnable) { + this.condition.filters = {status: ["Trash"]}; + } + else { + this.condition.filters = {status: ["Prepare", "Underway", "Completed"]}; + } this.initTable(); this.getMaintainerOptions(); }, From 5e292f2cfcd96a24f96c508c2656d00fc53cbdcc Mon Sep 17 00:00:00 2001 From: Coooder-X <55648333+Coooder-X@users.noreply.github.com> Date: Wed, 27 Jan 2021 19:20:56 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20(=E6=B5=8B=E8=AF=95=E8=AE=A1?= =?UTF-8?q?=E5=88=92)=20=E8=A7=A3=E5=86=B3=E5=85=B3=E8=81=94=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E7=94=A8=E4=BE=8B=E6=97=B6tag=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=20(#1276)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/comonents/api/RelevanceScenarioList.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue index b50dbfa2b3..d142385aaf 100644 --- a/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue +++ b/frontend/src/business/components/track/plan/view/comonents/api/RelevanceScenarioList.vue @@ -19,8 +19,8 @@ @@ -101,6 +101,15 @@ }, }, methods: { + getTagString(tagsString) { + // if(tagsString.length == 2) { + if(tagsString.length >= 2 && tagsString[0] == '[' && tagsString[1] == ']') { + return null; + } + tagsString = tagsString.substring(1, tagsString.length - 1); + let tagList = tagsString.split(','); + return tagList; + }, search() { this.selectRows = new Set(); this.loading = true;