From 75eeae71de73dfea137d3fd6656da36f47a46410 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Dec 2020 10:54:49 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/complete/EditCompleteHTTPApi.vue   | 15 ++++++---------
 frontend/src/i18n/en-US.js                        |  2 +-
 frontend/src/i18n/zh-CN.js                        |  2 +-
 frontend/src/i18n/zh-TW.js                        |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
index bbb7d76635..cbfac1cf9f 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -100,13 +100,18 @@
     name: "MsAddCompleteHttpApi",
     components: {MsResponseText, MsApiRequestForm, MsJsr233Processor},
     data() {
+      let validateURL = (rule, value, callback) => {
+        if (!this.httpForm.path.startsWith("/") || this.httpForm.path.match(/\s/) != null) {
+          callback(this.$t('api_test.definition.request.path_valid_info'));
+        }
+      };
       return {
         rule: {
           name: [
             {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
             {max: 50, message: this.$t('test_track.length_less_than') + '50', trigger: 'blur'}
           ],
-          path: [{required: true, message: this.$t('api_test.definition.request.path_info'), trigger: 'blur'}],
+          path: [{required: true, message: this.$t('api_test.definition.request.path_info'), trigger: 'blur'}, {validator: validateURL, trigger: 'blur'}],
           userId: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
           moduleId: [{required: true, message: this.$t('test_track.case.input_module'), trigger: 'change'}],
           status: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}],
@@ -124,10 +129,6 @@
       runTest() {
         this.$refs['httpForm'].validate((valid) => {
           if (valid) {
-            if(this.httpForm.path.match(/\s/)!=null){
-              this.$error(this.$t("api_test.definition.request.path_valid_info"));
-              return false;
-            }
             this.setParameter();
             this.$emit('runTest', this.httpForm);
           } else {
@@ -150,10 +151,6 @@
       saveApi() {
         this.$refs['httpForm'].validate((valid) => {
           if (valid) {
-            if(this.httpForm.path.match(/\s/)!=null){
-              this.$error(this.$t("api_test.definition.request.path_valid_info"));
-              return false;
-            }
             this.setParameter();
             this.$emit('saveApi', this.httpForm);
           }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 98297db031..675c403610 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -543,7 +543,7 @@ export default {
         create_info: 'Create',
         update_info: 'Update',
         batch_edit: "Batch edit",
-        path_valid_info: "The request address cannot contain spaces",
+        path_valid_info: "The request path is invalid",
       }
     },
     automation: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e9bde643d8..465d4d9c9a 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -542,7 +542,7 @@ export default {
         create_info: '创建',
         update_info: '更新',
         batch_edit: "批量编辑",
-        path_valid_info: "请求地址不能包含空格",
+        path_valid_info: "请求路径无效",
       }
     },
     automation: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 70711b87c7..c7c05280ed 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -542,7 +542,7 @@ export default {
         create_info: '創建',
         update_info: '更新',
         batch_edit: "批量編輯",
-        path_valid_info: "請求地址不能包含空格",
+        path_valid_info: "請求路径无效",
       }
     },
     automation: {

From 4ec766605c8a4533013ceb5f809d02b42940885f Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 18 Dec 2020 10:56:18 +0800
Subject: [PATCH 2/7] refactor: i18n

---
 frontend/src/business/components/common/head/SearchList.vue | 6 +++---
 frontend/src/i18n/en-US.js                                  | 2 ++
 frontend/src/i18n/zh-CN.js                                  | 2 ++
 frontend/src/i18n/zh-TW.js                                  | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/common/head/SearchList.vue b/frontend/src/business/components/common/head/SearchList.vue
index 1cc176fd5e..2d13248506 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-loading="result.loading">
-    <el-input placeholder="搜索项目"
+    <el-input :placeholder="$t('project.search_by_name')"
               prefix-icon="el-icon-search"
               v-model="searchString"
               clearable
@@ -8,7 +8,7 @@
               size="small"/>
     <div v-if="items.length === 0" style="text-align: center; margin: 15px 0">
         <span style="font-size: 15px; color: #8a8b8d;">
-          无数据
+          {{ $t('project.no_data') }}
         </span>
     </div>
     <div v-else style="height: 150px;overflow: auto">
@@ -114,7 +114,7 @@ export default {
           this.$emit("update:currentProject", project[0].name);
         }
       } else {
-        this.$emit("update:currentProject", '选择项目');
+        this.$emit("update:currentProject", this.$t('project.select'));
       }
     }
   }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 98297db031..24470af111 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -304,6 +304,8 @@ export default {
     jira_key: 'JIRA Project key',
     zentao_id: 'Zentao Project ID',
     manager: 'Manager',
+    no_data: 'No Data',
+    select: 'Select'
   },
   member: {
     create: 'Create',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e9bde643d8..f50eadcb16 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -301,6 +301,8 @@ export default {
     jira_key: 'JIRA项目key',
     zentao_id: 'Zentao项目ID',
     manager: '项目管理',
+    no_data: '无数据',
+    select: '选择项目'
   },
   member: {
     create: '添加成员',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 70711b87c7..94bbb12cdf 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -301,6 +301,8 @@ export default {
     jira_key: 'JIRA項目key',
     zentao_id: 'Zentao項目ID',
     manager: '項目管理',
+    no_data: '無數據',
+    select: '選擇項目'
   },
   member: {
     create: '添加成員',

From a4189ecacc55b7235f37506c369efdc1293b02dc Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 18 Dec 2020 11:12:39 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settings/project/MsProject.vue | 28 +------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/frontend/src/business/components/settings/project/MsProject.vue b/frontend/src/business/components/settings/project/MsProject.vue
index 8e22b5eb9f..99c2821329 100644
--- a/frontend/src/business/components/settings/project/MsProject.vue
+++ b/frontend/src/business/components/settings/project/MsProject.vue
@@ -5,7 +5,7 @@
         <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="search" @create="create"
                          :create-tip="btnTips" :title="$t('commons.project')"/>
       </template>
-      <el-table border class="adjust-table" @row-click="link" :data="items" style="width: 100%" @sort-change="sort">
+      <el-table border class="adjust-table" :data="items" style="width: 100%" @sort-change="sort">
         <el-table-column prop="name" :label="$t('commons.name')" width="250" show-overflow-tooltip/>
         <el-table-column prop="description" :label="$t('commons.description')" show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -95,7 +95,6 @@ import MsDeleteConfirm from "../../common/components/MsDeleteConfirm";
 import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
 import ApiEnvironmentConfig from "../../api/test/components/ApiEnvironmentConfig";
 import TemplateComponent from "../../track/plan/view/comonents/report/TemplateComponent/TemplateComponent";
-import {ApiEvent, LIST_CHANGE, PerformanceEvent, TrackEvent} from "@/business/components/common/head/ListEvent";
 import {PROJECT_ID} from "@/common/js/constants";
 
 export default {
@@ -223,10 +222,6 @@ export default {
           }
           Message.success(this.$t('commons.delete_success'));
           this.list();
-          // 发送广播，刷新 head 上的最新列表
-          ApiEvent.$emit(LIST_CHANGE);
-          TrackEvent.$emit(LIST_CHANGE);
-          PerformanceEvent.$emit(LIST_CHANGE);
         });
       }).catch(() => {
         this.$message({
@@ -253,22 +248,6 @@ export default {
         this.total = data.itemCount;
       })
     },
-    link(row) {
-      // performance_test project link
-      if (this.$route.name === 'perProject') {
-        this.$router.push({
-          path: '/performance/test/' + row.id,
-        })
-      } else if (this.$route.name === 'fucProject') {
-        this.$router.push({
-          path: '/api/test/list/' + row.id
-        })
-      } else if (this.$route.name === 'trackProject') {
-        this.$router.push({
-          path: '/track/case/' + row.id
-        })
-      }
-    },
     sort(column) {
       _sort(column, this.condition);
       this.list();
@@ -292,11 +271,6 @@ export default {
 </script>
 
 <style scoped>
-
-.el-table {
-  cursor: pointer;
-}
-
   pre {
     margin: 0 0;
   }

From db0b1768a9d6f9a72fd75ccae7e3aff2774f975a Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Dec 2020 11:13:51 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/components/debug/DebugHttpPage.vue    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
index d272e61ee9..e1692d8b37 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
@@ -63,10 +63,20 @@
       scenario: Boolean,
     },
     data() {
+      let validateURL = (rule, value, callback) => {
+        try {
+          new URL(this.debugForm.url);
+        } catch (e) {
+          callback(this.$t('api_test.request.url_invalid'));
+        }
+      };
       return {
         rules: {
           method: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
-          url: [{required: true, message: this.$t('api_test.definition.request.path_all_info'), trigger: 'blur'}],
+          url: [
+            {max: 500, required: true, message: this.$t('commons.input_limit', [1, 500]), trigger: 'blur'},
+            {validator: validateURL, trigger: 'blur'}
+          ],
         },
         debugForm: {method: REQ_METHOD[0].id, environmentId: ""},
         options: [],

From d03b242701cd2cc29df36127387d6e0b14bf3039 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 18 Dec 2020 11:15:01 +0800
Subject: [PATCH 5/7] chore: Sync

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 61397c1672..efb49c9b4b 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 61397c16728a63493507679f7e0940d9099f337f
+Subproject commit efb49c9b4be136ce48e9550dc9c8a2975d9f4d7f

From 096ee6bd5b7da3ea2d6655d9dcabf72d9d391346 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Dec 2020 11:35:17 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E6=9E=84=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/api/definition/ApiDefinition.vue    | 2 +-
 .../api/definition/components/complete/EditCompleteHTTPApi.vue  | 1 +
 .../api/definition/components/runtest/RunTestHTTPPage.vue       | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 39ee408a7b..3ce95ebb1a 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -268,7 +268,7 @@
       },
       saveApi(data) {
         this.setTabTitle(data);
-        this.$refs.apiList[0].initApiTable(data);
+        this.$refs.apiList[0].initTable(data);
       },
 
       showExecResult(row){
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
index cbfac1cf9f..a5a4fb7b07 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -104,6 +104,7 @@
         if (!this.httpForm.path.startsWith("/") || this.httpForm.path.match(/\s/) != null) {
           callback(this.$t('api_test.definition.request.path_valid_info'));
         }
+        callback();
       };
       return {
         rule: {
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
index 016912750a..d58117c3f8 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
@@ -206,6 +206,8 @@
         data.request = JSON.stringify(this.api.request);
         data.method = this.api.method;
         data.url = this.api.url;
+        let id = getUUID();
+        data.id = id;
         data.status = this.api.status;
         data.userId = this.api.userId;
         data.description = this.api.description;

From a59238d93caa373fe65ca932515aba7a5b3d93ca Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Dec 2020 12:46:09 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E7=A7=BB=E9=99=A4=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/service/ApiDefinitionService.java   | 2 ++
 backend/src/main/java/io/metersphere/xpack                      | 2 +-
 .../components/api/automation/scenario/EditApiScenario.vue      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index c708e19d9c..d82500fcfa 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -201,6 +201,7 @@ public class ApiDefinitionService {
         test.setName(request.getName());
         test.setPath(request.getPath());
         test.setProjectId(request.getProjectId());
+        request.getRequest().setId(request.getId());
         test.setRequest(JSONObject.toJSONString(request.getRequest()));
         test.setUpdateTime(System.currentTimeMillis());
         test.setStatus(request.getStatus());
@@ -227,6 +228,7 @@ public class ApiDefinitionService {
         test.setPath(request.getPath());
         test.setModuleId(request.getModuleId());
         test.setProjectId(request.getProjectId());
+        request.getRequest().setId(request.getId());
         test.setRequest(JSONObject.toJSONString(request.getRequest()));
         test.setCreateTime(System.currentTimeMillis());
         test.setUpdateTime(System.currentTimeMillis());
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index efb49c9b4b..61397c1672 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit efb49c9b4be136ce48e9550dc9c8a2975d9f4d7f
+Subproject commit 61397c16728a63493507679f7e0940d9099f337f
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 3dacc7a663..0136fad3e7 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -552,7 +552,7 @@
       remove(row, node) {
         const parent = node.parent
         const hashTree = parent.data.hashTree || parent.data;
-        const index = hashTree.findIndex(d => d.id != undefined && row.id != undefined && d.id === row.id)
+        const index = hashTree.findIndex(d => d.resourceId != undefined && row.resourceId != undefined && d.resourceId === row.resourceId)
         hashTree.splice(index, 1);
         this.sort();
         this.reload();