From 5e6aea31ce5984ff9cd9b828d398a92713dc539c Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 27 Jan 2021 18:20:03 +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=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/api/service/HistoricalDataUpgradeService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
index e880362bab..a36b4ff3d7 100644
--- a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
+++ b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
@@ -134,7 +134,9 @@ public class HistoricalDataUpgradeService {
                         request1.getBody().setType(Body.FORM_DATA);
                     }
                     if ("json".equals(request1.getBody().getFormat())) {
-                        request1.getBody().setType(Body.JSON);
+                        if ("Raw".equals(request1.getBody().getType())) {
+                            request1.getBody().setType(Body.JSON);
+                        }
                         if (CollectionUtils.isEmpty(request1.getHeaders())) {
                             List<KeyValue> headers = new LinkedList<>();
                             headers.add(new KeyValue("Content-Type", "application/json"));

From 4f4f8aa38d02f474249ec42e5a1c8cd4ae68988f Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 27 Jan 2021 19:55:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index bc6f32603c..0c14e36851 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -137,7 +137,7 @@
             </div>
             <!-- 场景步骤内容 -->
             <div v-loading="loading">
-              <el-tree node-key="resourceId" :props="props" :data="scenarioDefinition"
+              <el-tree node-key="resourceId" :props="props" :data="scenarioDefinition" class="ms-tree"
                        :default-expanded-keys="expandedNode"
                        :expand-on-click-node="false"
                        highlight-current
@@ -848,7 +848,7 @@
               if (this.currentScenario.tags instanceof String) {
                 this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
               }
-              this.$emit('refresh',this.currentScenario);
+              this.$emit('refresh', this.currentScenario);
             })
           }
         })
@@ -1037,15 +1037,27 @@
     z-index: 1;
   }
 
-  .ms-expanded >>> .el-tree-node__expand-icon.expanded {
-    color: #7C3985;
+  .ms-tree >>> .el-tree-node__expand-icon.expanded {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
   }
 
-  .ms-el-icon-caret-right .el-icon-caret-right {
-    color: #7C3985;
+  .ms-tree >>> .el-icon-caret-right:before {
+    content: '\e723';
+    font-size: 18px;
   }
 
-  .ms-is-leaf >>> .is-leaf {
+  .ms-tree >>> .el-tree-node__expand-icon.is-leaf {
     color: transparent;
   }
+
+  .ms-tree >>> .el-tree-node__expand-icon {
+    color: #7C3985;
+  }
+
+  .ms-tree >>> .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
+    color: #7C3985;
+    content: "\e722";
+    font-size: 18px;
+  }
 </style>

From 267dd14a934a2d7b2cf0db4358cabb5976195f74 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 28 Jan 2021 09:56:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/database/BasisParameters.vue      | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
index 79792f9145..11f2824c06 100644
--- a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
+++ b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
@@ -64,22 +64,22 @@
           </el-form>
         </div>
         <!--<div v-if="showScript">-->
-          <!--<div v-for="row in request.hashTree" :key="row.id" v-loading="isReloadData" style="margin-left: 20px;width: 100%">-->
-            <!--&lt;!&ndash; 前置脚本 &ndash;&gt;-->
-            <!--<ms-jsr233-processor v-if="row.label ==='JSR223 PreProcessor'" @copyRow="copyRow" @remove="remove" :is-read-only="false" :title="$t('api_test.definition.request.pre_script')" style-type="color: #B8741A;background-color: #F9F1EA"-->
-                                 <!--:jsr223-processor="row"/>-->
-            <!--&lt;!&ndash;后置脚本&ndash;&gt;-->
-            <!--<ms-jsr233-processor v-if="row.label ==='JSR223 PostProcessor'" @copyRow="copyRow" @remove="remove" :is-read-only="false" :title="$t('api_test.definition.request.post_script')" style-type="color: #783887;background-color: #F2ECF3"-->
-                                 <!--:jsr223-processor="row"/>-->
-            <!--&lt;!&ndash;断言规则&ndash;&gt;-->
-            <!--<div style="margin-top: 10px">-->
-              <!--<ms-api-assertions v-if="row.type==='Assertions'" @copyRow="copyRow" @remove="remove" :is-read-only="isReadOnly" :assertions="row"/>-->
-            <!--</div>-->
-            <!--&lt;!&ndash;提取规则&ndash;&gt;-->
-            <!--<div style="margin-top: 10px">-->
-              <!--<ms-api-extract :is-read-only="isReadOnly" @copyRow="copyRow" @remove="remove" v-if="row.type==='Extract'" :extract="row"/>-->
-            <!--</div>-->
-          <!--</div>-->
+        <!--<div v-for="row in request.hashTree" :key="row.id" v-loading="isReloadData" style="margin-left: 20px;width: 100%">-->
+        <!--&lt;!&ndash; 前置脚本 &ndash;&gt;-->
+        <!--<ms-jsr233-processor v-if="row.label ==='JSR223 PreProcessor'" @copyRow="copyRow" @remove="remove" :is-read-only="false" :title="$t('api_test.definition.request.pre_script')" style-type="color: #B8741A;background-color: #F9F1EA"-->
+        <!--:jsr223-processor="row"/>-->
+        <!--&lt;!&ndash;后置脚本&ndash;&gt;-->
+        <!--<ms-jsr233-processor v-if="row.label ==='JSR223 PostProcessor'" @copyRow="copyRow" @remove="remove" :is-read-only="false" :title="$t('api_test.definition.request.post_script')" style-type="color: #783887;background-color: #F2ECF3"-->
+        <!--:jsr223-processor="row"/>-->
+        <!--&lt;!&ndash;断言规则&ndash;&gt;-->
+        <!--<div style="margin-top: 10px">-->
+        <!--<ms-api-assertions v-if="row.type==='Assertions'" @copyRow="copyRow" @remove="remove" :is-read-only="isReadOnly" :assertions="row"/>-->
+        <!--</div>-->
+        <!--&lt;!&ndash;提取规则&ndash;&gt;-->
+        <!--<div style="margin-top: 10px">-->
+        <!--<ms-api-extract :is-read-only="isReadOnly" @copyRow="copyRow" @remove="remove" v-if="row.type==='Extract'" :extract="row"/>-->
+        <!--</div>-->
+        <!--</div>-->
         <!--</div>-->
       </el-col>
       <el-col :span="3" class="ms-left-cell" v-if="showScript">
@@ -225,6 +225,9 @@
           if (!hasEnvironment) {
             this.request.environmentId = undefined;
           }
+          if (!this.request.environmentId) {
+            this.request.dataSourceId = undefined;
+          }
           this.initDataSource();
         });
       },