From 5d78d510912f35af965110462965339b770f47f8 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 30 Mar 2021 19:54:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=A3=80=E6=9F=A5=E5=9C=BA=E6=99=AF=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E6=98=AF=E5=90=A6=E9=83=BD=E6=98=AF=E5=85=A8=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   |   2 +-
 .../api/automation/scenario/EnvPopover.vue    |   4 +-
 .../api/automation/scenario/EnvSelect.vue     | 336 ++++++++++++------
 3 files changed, 233 insertions(+), 109 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 09d3cdf8ce..48fc69aa8d 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -767,7 +767,7 @@
       },
       runDebug() {
         /*触发执行操作*/
-        let sign = this.$refs.envPopover.checkEnv();
+        let sign = this.$refs.envPopover.checkEnv(this.scenarioDefinition);
         if (!sign) {
           return;
         }
diff --git a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
index bc7296c026..32580f3be9 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvPopover.vue
@@ -44,8 +44,8 @@ export default {
     setProjectEnvMap(map) {
       this.$emit("setProjectEnvMap", map);
     },
-    checkEnv() {
-      return this.$refs.envSelect.checkEnv();
+    checkEnv(data) {
+      return this.$refs.envSelect.checkEnv(data);
     }
   }
 
diff --git a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
index 87c62495f0..eb202c6082 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
@@ -29,133 +29,257 @@
 </template>
 
 <script>
-import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
-import ApiEnvironmentConfig from "@/business/components/api/definition/components/environment/ApiEnvironmentConfig";
+  import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
+  import ApiEnvironmentConfig from "@/business/components/api/definition/components/environment/ApiEnvironmentConfig";
+  import {ELEMENTS} from "./Setting";
 
-export default {
-  name: "EnvironmentSelect",
-  components: {ApiEnvironmentConfig},
-  props: {
-    envMap: Map,
-    projectIds: Set,
-    projectList: Array
-  },
-  data() {
-    return {
-      data: [],
-      result: {},
-      projects: [],
-      environments: [],
-      dialogVisible: false
-    }
-  },
-  methods: {
-    init() {
-      this.projectIds.forEach(id => {
-        let item = {id: id, envs: [], selectEnv: ""};
-        this.data.push(item);
-        this.result = this.$get('/api/environment/list/' + id, res => {
-          let envs = res.data;
-          envs.forEach(environment => {
-            parseEnvironment(environment);
-          });
-          // 固定环境列表渲染顺序
-          let temp = this.data.find(dt => dt.id === id);
-          temp.envs = envs;
-          let envId = this.envMap.get(id);
-          // 选中环境是否存在
-          temp.selectEnv = envs.filter(e =>e.id === envId).length === 0 ? null : envId;
+  export default {
+    name: "EnvironmentSelect",
+    components: {ApiEnvironmentConfig},
+    props: {
+      envMap: Map,
+      projectIds: Set,
+      projectList: Array
+    },
+    data() {
+      return {
+        data: [],
+        result: {},
+        projects: [],
+        environments: [],
+        dialogVisible: false,
+        isFullUrl: true,
+      }
+    },
+    methods: {
+      init() {
+        this.projectIds.forEach(id => {
+          let item = {id: id, envs: [], selectEnv: ""};
+          this.data.push(item);
+          this.result = this.$get('/api/environment/list/' + id, res => {
+            let envs = res.data;
+            envs.forEach(environment => {
+              parseEnvironment(environment);
+            });
+            // 固定环境列表渲染顺序
+            let temp = this.data.find(dt => dt.id === id);
+            temp.envs = envs;
+            let envId = this.envMap.get(id);
+            // 选中环境是否存在
+            temp.selectEnv = envs.filter(e => e.id === envId).length === 0 ? null : envId;
+          })
         })
-      })
-    },
-    open() {
-      this.data = [];
-      if (this.projectIds.size > 0) {
-        this.init();
-      }
-    },
-    getProjectName(id) {
-      const project = this.projectList.find(p => p.id === id);
-      return project ? project.name : "";
-    },
-    openEnvironmentConfig(projectId, envId) {
-      if (!projectId) {
-        this.$error(this.$t('api_test.select_project'));
-        return;
-      }
-      this.$refs.environmentConfig.open(projectId, envId);
-    },
-    handleConfirm() {
-      let map = new Map();
-      let sign = true;
-      this.data.forEach(dt => {
-        if (!dt.selectEnv) {
-          sign = false;
+      },
+      open() {
+        this.data = [];
+        if (this.projectIds.size > 0) {
+          this.init();
+        }
+      },
+      getProjectName(id) {
+        const project = this.projectList.find(p => p.id === id);
+        return project ? project.name : "";
+      },
+      openEnvironmentConfig(projectId, envId) {
+        if (!projectId) {
+          this.$error(this.$t('api_test.select_project'));
           return;
         }
-        map.set(dt.id, dt.selectEnv);
-      })
-      if (!sign) {
-        this.$warning("请为每个项目选择一个运行环境！");
-        return;
-      }
-      this.$emit('setProjectEnvMap', map);
-      this.$emit('close');
-    },
-    checkEnv() {
-      let sign = true;
-      if (this.data.length > 0) {
+        this.$refs.environmentConfig.open(projectId, envId);
+      },
+      handleConfirm() {
+        let map = new Map();
+        let sign = true;
         this.data.forEach(dt => {
           if (!dt.selectEnv) {
             sign = false;
-            return false;
+            return;
+          }
+          map.set(dt.id, dt.selectEnv);
+        })
+        if (!sign) {
+          this.$warning("请为每个项目选择一个运行环境！");
+          return;
+        }
+        this.$emit('setProjectEnvMap', map);
+        this.$emit('close');
+      },
+      getApiInfo(request) {
+        if (request.id && request.referenced === 'REF') {
+          let requestResult = request.requestResult;
+          let url = request.refType && request.refType === 'CASE' ? "/api/testcase/get/" : "/api/definition/get/";
+          let enable = request.enable;
+          this.$get(url + request.id, response => {
+            if (response.data) {
+              Object.assign(request, JSON.parse(response.data.request));
+              request.name = response.data.name;
+              request.enable = enable;
+              if (response.data.path && response.data.path != null) {
+                request.path = response.data.path;
+                request.url = response.data.url;
+                this.setUrl(request.path);
+              }
+              if (response.data.method && response.data.method != null) {
+                request.method = response.data.method;
+              }
+              request.requestResult = requestResult;
+              request.id = response.data.id;
+              request.disabled = true;
+              request.root = true;
+              if (!request.projectId) {
+                request.projectId = response.data.projectId;
+              }
+              this.reload();
+              this.sort();
+            } else {
+              request.referenced = "Deleted";
+            }
+          })
+        }
+      },
+      getScenario(scenario) {
+        this.result = this.$get("/api/automation/getApiScenario/" + scenario.id, response => {
+          if (response.data) {
+            scenario.loaded = true;
+            let obj = {};
+            if (response.data.scenarioDefinition) {
+              obj = JSON.parse(response.data.scenarioDefinition);
+              scenario.hashTree = obj.hashTree;
+            }
+            //scenario.disabled = true;
+            scenario.name = response.data.name;
+            if (!scenario.projectId) {
+              scenario.projectId = response.data.projectId;
+            }
+            scenario.headers = obj.headers;
+            scenario.variables = obj.variables;
+            scenario.environmentMap = obj.environmentMap;
+            this.$emit('refReload');
+          } else {
+            scenario.referenced = "Deleted";
           }
         })
-      } else {
-        // 如果有环境，检查环境
-        if (this.envMap && this.envMap.size > 0) {
-          this.projectIds.forEach(id => {
-            if (!this.envMap.get(id)) {
+      },
+      recursiveSorting(arr) {
+        for (let i in arr) {
+          if (arr[i].referenced === 'REF') {
+            // 分场景和接口
+            if (arr[i].type === "HTTPSamplerProxy") {
+              // 获取源头内容
+              this.getApiInfo(arr[i]);
+              // 校验是否是全路径
+              if (!arr[i].url || (!arr[i].url.startsWith("http://") && !arr[i].url.startsWith("https://"))) {
+                this.isFullUrl = false;
+              }
+            } else if (arr[i].type === "scenario") {
+              this.getScenario(arr[i]);
+            }
+
+          } else {
+            if (arr[i].type === "HTTPSamplerProxy") {
+              // 校验是否是全路径
+              if (arr[i].enable) {
+                if (!arr[i].url || (!arr[i].url.startsWith("http://") && !arr[i].url.startsWith("https://"))) {
+                  this.isFullUrl = false;
+                }
+              }
+            }
+          }
+          if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
+            this.recursiveSorting(arr[i].hashTree);
+          }
+        }
+      },
+      checkFullUrl(scenarioDefinition) {
+        for (let i in scenarioDefinition) {
+          // 设置项目ID
+          let request = scenarioDefinition[i];
+          if (request.referenced === 'REF') {
+            if (request.type === "HTTPSamplerProxy") {
+              this.getApiInfo(request);
+              // 校验是否是全路径
+              if (!request.url || (!request.url.startsWith("http://") && !request.url.startsWith("https://"))) {
+                this.isFullUrl = false;
+              }
+            } else if (request.type === "scenario") {
+              this.getScenario(request);
+            }
+          } else {
+            if (request.type === "HTTPSamplerProxy") {
+              // 校验是否是全路径
+
+              if (request.enable) {
+                if (!request.url || (!request.url.startsWith("http://") && !request.url.startsWith("https://"))) {
+                  this.isFullUrl = false;
+                }
+              }
+            }
+          }
+          if (scenarioDefinition[i].hashTree != undefined && scenarioDefinition[i].hashTree.length > 0) {
+            this.recursiveSorting(scenarioDefinition[i].hashTree);
+          }
+        }
+      },
+      checkEnv(data) {
+        let sign = true;
+        this.isFullUrl = true;
+        if (this.data.length > 0) {
+          this.data.forEach(dt => {
+            if (!dt.selectEnv) {
               sign = false;
               return false;
             }
           })
         } else {
-          sign = false;
-        }
-      }
+          // 如果有环境，检查环境
+          if (this.envMap && this.envMap.size > 0) {
+            this.projectIds.forEach(id => {
+              if (!this.envMap.get(id)) {
+                sign = false;
+                return false;
+              }
+            })
+          } else {
+            // this.checkFullUrl(data);
+            // sign = this.isFullUrl;
+            sign = false;
+          }
 
-      if (!sign) {
-        this.$warning("请为每个项目选择一个运行环境！");
-        return false;
+          // 校验是否全是全路径
+
+        }
+
+        if (!sign) {
+          this.$warning("请为每个项目选择一个运行环境！");
+          return false;
+        }
+        return true;
+      },
+      environmentConfigClose() {
+        // todo 关闭处理
       }
-      return true;
-    },
-    environmentConfigClose() {
-      // todo 关闭处理
     }
   }
-}
 </script>
 
 <style scoped>
-.ms-scenario-button {
-  margin-left: 20px;
-}
+  .ms-scenario-button {
+    margin-left: 20px;
+  }
 
-.env-confirm {
-  margin-left: 20px;
-  width: 360px;
-  margin-top: 10px;
-}
+  .env-confirm {
+    margin-left: 20px;
+    width: 360px;
+    margin-top: 10px;
+  }
 
-.project-name {
-  display:inline-block;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width: 150px;
-  margin-left: 8px;
-  vertical-align:middle;
-}
+  .project-name {
+    display: inline-block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 150px;
+    margin-left: 8px;
+    vertical-align: middle;
+  }
 </style>

From bdc01272077c9916fb7e4790d0cfa262d70b75a4 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 30 Mar 2021 22:07:53 +0800
Subject: [PATCH 2/3] chore: sync

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index afb50f2246..a37e6bb56f 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit afb50f22464b832e4f458f3f7947e6d8f982707e
+Subproject commit a37e6bb56ffaa7ecc4ee128640e9415304ad41b6

From c1f00d825733553a213d2d146a7a4defc0c88d0c Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Wed, 31 Mar 2021 08:17:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=9B=BA=E5=AE=9A=E5=88=97=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E9=94=99=E4=B9=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/automation/scenario/ApiScenarioList.vue      | 2 +-
 .../api/definition/components/list/ApiCaseSimpleList.vue        | 2 +-
 .../components/api/definition/components/list/ApiList.vue       | 2 +-
 .../business/components/track/case/components/TestCaseList.vue  | 2 +-
 .../plan/view/comonents/functional/FunctionalTestCaseList.vue   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index f30bf7315c..c6c9e7a3f0 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -447,7 +447,7 @@ export default {
 
           this.$nextTick(function () {
             if (this.$refs.scenarioTable) {
-              this.$refs.scenarioTable.doLayout();
+              setTimeout(this.$refs.scenarioTable.doLayout, 200)
             }
             this.checkTableRowIsSelect();
           })
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 7b4c2e1894..da43f454f7 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -354,7 +354,7 @@ export default {
 
           this.$nextTick(function () {
             if (this.$refs.caseTable) {
-              this.$refs.caseTable.doLayout();
+              setTimeout(this.$refs.caseTable.doLayout, 200)
             }
             this.checkTableRowIsSelect();
           })
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 71c3e4b7b2..c13957ac04 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -463,7 +463,7 @@ export default {
           // nexttick:表格加载完成之后触发。判断是否需要勾选行
           this.$nextTick(function () {
             if (this.$refs.apiDefinitionTable) {
-              this.$refs.apiDefinitionTable.doLayout();
+              setTimeout(this.$refs.apiDefinitionTable.doLayout, 200)
             }
             this.checkTableRowIsSelect();
           })
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index eca9805b0d..0ed5bf3334 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -397,7 +397,7 @@ export default {
 
           this.$nextTick(() => {
             if (this.$refs.table) {
-              this.$refs.table.doLayout();
+              setTimeout(this.$refs.table.doLayout, 200)
             }
             this.checkTableRowIsSelect();
           })
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 793b120a56..848e9e12ab 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -473,7 +473,7 @@ export default {
           }
           this.selectRows.clear();
           if (this.$refs.table) {
-            this.$refs.table.doLayout();
+            setTimeout(this.$refs.table.doLayout, 200)
           }
         });
       }