Merge remote-tracking branch 'origin/master'

babysor · Jan 27, 2021 · 99ec66a · 99ec66a
2 parents 1f011e7 + a404fbf
commit 99ec66a
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 13 deletions.
diff --git a/backend/src/main/java/io/metersphere/config/MybatisConfig.java b/backend/src/main/java/io/metersphere/config/MybatisConfig.java
@@ -2,6 +2,7 @@
 
 import com.github.pagehelper.PageInterceptor;
 import io.metersphere.base.domain.ApiTestReportDetail;
+import io.metersphere.base.domain.AuthSource;
 import io.metersphere.base.domain.FileContent;
 import io.metersphere.base.domain.TestResource;
 import io.metersphere.commons.utils.CompressUtils;
@@ -45,6 +46,7 @@ public MybatisInterceptor dbInterceptor() {
         configList.add(new MybatisInterceptorConfig(FileContent.class, "file", CompressUtils.class, "zip", "unzip"));
         configList.add(new MybatisInterceptorConfig(ApiTestReportDetail.class, "content", CompressUtils.class, "compress", "decompress"));
         configList.add(new MybatisInterceptorConfig(TestResource.class, "configuration"));
+        configList.add(new MybatisInterceptorConfig(AuthSource.class, "configuration"));
         interceptor.setInterceptorConfigList(configList);
         return interceptor;
     }

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -143,7 +143,7 @@
                        highlight-current
                        @node-expand="nodeExpand"
                        @node-collapse="nodeCollapse"
-                       :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable class="ms-is-leaf">
+                       :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable>
                     <span class="custom-tree-node father" slot-scope="{ node, data}" style="width: 96%">
                       <!-- 步骤组件-->
                        <ms-component-config :type="data.type" :scenario="data" :response="response" :currentScenario="currentScenario"
@@ -1037,11 +1037,11 @@
     z-index: 1;
   }
 
-  /deep/ .el-tree-node__expand-icon.expanded {
+  .ms-expanded >>> .el-tree-node__expand-icon.expanded {
     color: #7C3985;
   }
 
-  /deep/ .el-icon-caret-right {
+  .ms-el-icon-caret-right .el-icon-caret-right {
     color: #7C3985;
   }
 

diff --git a/frontend/src/business/components/api/automation/scenario/MsInputTag.vue b/frontend/src/business/components/api/automation/scenario/MsInputTag.vue
@@ -21,7 +21,7 @@
       v-if="!readOnly"
       class="tag-input el-input"
       v-model="newTag"
-      placeholder="$t('commons.tag_tip)"
+      :placeholder="$t('commons.tag_tip')"
       @keydown.delete.stop="removeLastTag"
       @keydown="addNew"
       @blur="addNew"/>

diff --git a/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugDubboPage.vue
@@ -24,7 +24,7 @@
       <ms-run :debug="true" :reportId="reportId" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
     </el-card>
     <div v-if="scenario">
-      <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
+      <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
     </div>
     <!-- 加载用例 -->
     <ms-api-case-list :loaded="false" ref="caseList"/>
@@ -103,7 +103,10 @@
       handleCommand(e) {
         if (e === "save_as") {
           this.saveAs();
-        } else {
+        } else if (e === 'save_as_api') {
+          this.saveAsApi();
+        }
+        else {
           this.runDebug();
         }
       },
@@ -121,6 +124,11 @@
         this.loading = false;
         this.$refs.debugResult.reload();
       },
+      saveAsApi() {
+        let obj = {request: this.request};
+        obj.request.id = getUUID();
+        this.$emit('saveAs', obj);
+      },
       saveAs() {
         let obj = {request: this.request};
         obj.request.id = getUUID();

diff --git a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
@@ -39,7 +39,7 @@
     </el-card>
 
     <div v-if="scenario">
-      <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
+      <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
     </div>
     <!-- 加载用例 -->
     <ms-api-case-list :loaded="false" ref="caseList"/>
@@ -131,7 +131,10 @@
       handleCommand(e) {
         if (e === "save_as") {
           this.saveAs();
-        } else {
+        } else if (e === 'save_as_api') {
+          this.saveAsApi();
+        }
+        else {
           this.runDebug();
         }
       },
@@ -157,6 +160,22 @@
         this.loading = false;
         this.$refs.debugResult.reload();
       },
+      saveAsApi() {
+        this.$refs['debugForm'].validate((valid) => {
+          if (valid) {
+            this.debugForm.id = null;
+            this.request.id = getUUID();
+            this.debugForm.request = this.request;
+            this.debugForm.userId = getCurrentUser().id;
+            this.debugForm.status = "Underway";
+            this.debugForm.protocol = this.currentProtocol;
+            this.$emit('saveAs', this.debugForm);
+          }
+          else {
+            return false;
+          }
+        })
+      },
       saveAs() {
         this.$refs['debugForm'].validate((valid) => {
           if (valid) {

diff --git a/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugJdbcPage.vue
@@ -25,7 +25,7 @@
       <ms-run :debug="true" :reportId="reportId" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
     </el-card>
     <div v-if="scenario">
-      <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
+      <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
     </div>
     <!-- 加载用例 -->
     <ms-api-case-list :loaded="false" ref="caseList"/>
@@ -105,7 +105,10 @@
       handleCommand(e) {
         if (e === "save_as") {
           this.saveAs();
-        } else {
+        } else if (e === 'save_as_api') {
+          this.saveAsApi();
+        }
+        else {
           this.$refs['requestForm'].validate();
         }
       },
@@ -123,6 +126,11 @@
         this.loading = false;
         this.$refs.debugResult.reload();
       },
+      saveAsApi() {
+        let obj = {request: this.request};
+        obj.request.id = getUUID();
+        this.$emit('saveAs', obj);
+      },
       saveAs() {
         let obj = {request: this.request};
         obj.request.id = getUUID();

diff --git a/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
@@ -35,7 +35,7 @@
       <ms-run :debug="true" :reportId="reportId" :run-data="runData" @runRefresh="runRefresh" ref="runTest"/>
     </el-card>
     <div v-if="scenario">
-      <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as')"> {{$t('commons.save')}}</el-button>
+      <el-button style="float: right;margin: 20px" type="primary" @click="handleCommand('save_as_api')"> {{$t('commons.save')}}</el-button>
     </div>
     <!-- 加载用例 -->
     <ms-api-case-list :loaded="false" ref="caseList"/>
@@ -120,6 +120,8 @@
       handleCommand(e) {
         if (e === "save_as") {
           this.saveAs();
+        } else if (e === 'save_as_api') {
+          this.saveAsApi();
         } else {
           this.$refs['requestForm'].validate();
         }
@@ -138,6 +140,11 @@
         this.loading = false;
         this.$refs.debugResult.reload();
       },
+      saveAsApi() {
+        let obj = {request: this.request};
+        obj.request.id = getUUID();
+        this.$emit('saveAs', obj);
+      },
       saveAs() {
         let obj = {request: this.request};
         obj.request.server = this.debugForm.server;

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack