From e4f9df58225ebe0e0751107365b665bc044b6b74 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Fri, 22 Oct 2021 16:10:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(Mock=E6=B5=8B=E8=AF=95):=20#1007343=20#1007?=
 =?UTF-8?q?342=20=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3-MOCK-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0queryt-=E5=8D=95=E5=87=BB=E9=AB=98=E7=BA=A7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=8F=98=E6=9A=97=EF=BC=8C=E3=80=90?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E3=80=91-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0mock=E6=9C=9F=E6=9C=9B=E6=97=B6=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1007343 --user=宋天阳 【接口定义】-编辑接口-MOCK-添加queryt-单击高级配置页面变暗
https://www.tapd.cn/55049933/s/1057804；--bug=1007342 --user=宋天阳
【接口定义】-添加mock期望时多选框提示信息错误 https://www.tapd.cn/55049933/s/1057805
---
 .../api/definition/components/ApiKeyValue.vue         | 10 ++++++++--
 .../api/definition/components/ApiVariable.vue         | 11 +++++++++--
 .../api/definition/components/ApiVariableAdvance.vue  |  7 +++++++
 .../api/definition/components/ApiVariableJson.vue     |  8 +++++++-
 .../api/definition/components/ApiVariableSetting.vue  |  9 +++++++++
 .../components/mock/Components/MockApiBody.vue        |  1 +
 .../components/mock/Components/MockRequestParam.vue   |  6 +++---
 .../api/definition/components/mock/MockTab.vue        |  3 +++
 .../components/common/components/table/MsTable.vue    |  2 ++
 9 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/ApiKeyValue.vue b/frontend/src/business/components/api/definition/components/ApiKeyValue.vue
index 449d43606b..cd78867645 100644
--- a/frontend/src/business/components/api/definition/components/ApiKeyValue.vue
+++ b/frontend/src/business/components/api/definition/components/ApiKeyValue.vue
@@ -60,7 +60,7 @@
         </el-col>
       </el-row>
     </div>
-    <ms-api-variable-advance :current-item="currentItem" :parameters="keyValues" ref="variableAdvance"/>
+    <ms-api-variable-advance :append-to-body="appendToBody" :current-item="currentItem" :parameters="keyValues" ref="variableAdvance"/>
 
   </div>
 </template>
@@ -92,7 +92,13 @@
         type: Boolean,
         default: false
       },
-      showDesc: Boolean
+      showDesc: Boolean,
+      appendToBody: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      },
     },
     data() {
       return {
diff --git a/frontend/src/business/components/api/definition/components/ApiVariable.vue b/frontend/src/business/components/api/definition/components/ApiVariable.vue
index 0a34327de3..daaf50c216 100644
--- a/frontend/src/business/components/api/definition/components/ApiVariable.vue
+++ b/frontend/src/business/components/api/definition/components/ApiVariable.vue
@@ -89,11 +89,12 @@
       </el-row>
     </div>
     <ms-api-variable-advance ref="variableAdvance" :environment="environment" :scenario="scenario"
+                             :append-to-body="appendDialogToBody"
                              :parameters="parameters"
                              :current-item="currentItem"/>
-    <ms-api-variable-json ref="variableJson" @callback="callback"/>
+    <ms-api-variable-json :append-to-body="appendDialogToBody" ref="variableJson" @callback="callback"/>
 
-    <api-variable-setting
+    <api-variable-setting :append-to-body="appendDialogToBody"
       ref="apiVariableSetting"/>
 
   </div>
@@ -124,6 +125,12 @@ export default {
       type: String,
       default: ''
     },
+    appendDialogToBody: {
+      type: Boolean,
+      default() {
+        return false;
+      }
+    },
     isReadOnly: {
       type: Boolean,
       default: false
diff --git a/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue b/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
index fc66342376..5c019be8bc 100644
--- a/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
+++ b/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
@@ -1,6 +1,7 @@
 <template>
   <el-dialog :title="$t('api_test.request.parameters_advance')"
              :visible.sync="itemValueVisible"
+             :append-to-body="appendToBody"
              class="advanced-item-value"
              width="70%">
     <el-tabs tab-position="top" style="height: 50vh;" @tab-click="selectTab">
@@ -100,6 +101,12 @@
       environment: Object,
       scenario: Scenario,
       currentItem: Object,
+      appendToBody: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      },
     },
     data() {
       return {
diff --git a/frontend/src/business/components/api/definition/components/ApiVariableJson.vue b/frontend/src/business/components/api/definition/components/ApiVariableJson.vue
index c78ee428c5..4b57ebdfe3 100644
--- a/frontend/src/business/components/api/definition/components/ApiVariableJson.vue
+++ b/frontend/src/business/components/api/definition/components/ApiVariableJson.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <el-dialog
+  <el-dialog :append-to-body="appendToBody"
     :visible.sync="dialogVisible" destroy-on-close @close="close">
     <div style="padding: 10px">
       <el-switch active-text="JSON-SCHEMA" v-model="item.jsonType" @change="formatChange" active-value="JSON-SCHEMA"/>
@@ -36,6 +36,12 @@ export default {
       type: Boolean,
       default: false
     },
+    appendToBody: {
+      type: Boolean,
+      default() {
+        return false;
+      }
+    },
   },
   data() {
     return {
diff --git a/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue b/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue
index ada7419ec3..669f47e873 100644
--- a/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue
+++ b/frontend/src/business/components/api/definition/components/ApiVariableSetting.vue
@@ -4,6 +4,7 @@
     width="30%"
     :title="$t('run_mode.other_config')"
     :with-footer="false"
+    :append-to-body="appendToBody"
     :close-on-click-modal="true">
     <el-form>
       <el-row>
@@ -34,6 +35,14 @@
         data: {}
       }
     },
+    props:{
+      appendToBody: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      },
+    },
     methods: {
       open(item) {
         this.visible = true;
diff --git a/frontend/src/business/components/api/definition/components/mock/Components/MockApiBody.vue b/frontend/src/business/components/api/definition/components/mock/Components/MockApiBody.vue
index 62a4e5d49e..b32a044bd7 100644
--- a/frontend/src/business/components/api/definition/components/mock/Components/MockApiBody.vue
+++ b/frontend/src/business/components/api/definition/components/mock/Components/MockApiBody.vue
@@ -30,6 +30,7 @@
         :is-read-only="isReadOnly"
         :parameters="body.kvs"
         :isShowEnable="isShowEnable"
+        :append-dialog-to-body="true"
         type="body"/>
     </div>
     <div v-if="body.type == 'JSON'">
diff --git a/frontend/src/business/components/api/definition/components/mock/Components/MockRequestParam.vue b/frontend/src/business/components/api/definition/components/mock/Components/MockRequestParam.vue
index f7a328fb1a..04d680f937 100644
--- a/frontend/src/business/components/api/definition/components/mock/Components/MockRequestParam.vue
+++ b/frontend/src/business/components/api/definition/components/mock/Components/MockRequestParam.vue
@@ -17,7 +17,7 @@
               <el-row>
                 <el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}</el-link>
               </el-row>
-              <ms-api-key-value :show-desc="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :suggestions="headerSuggestions" :items="request.headers" :need-mock="true"/>
+              <ms-api-key-value :append-to-body="true" :show-desc="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :suggestions="headerSuggestions" :items="request.headers" :need-mock="true"/>
             </el-tab-pane>
 
             <!--query 参数-->
@@ -31,7 +31,7 @@
               <el-row>
                 <el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}</el-link>
               </el-row>
-              <ms-api-variable :with-mor-setting="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="request.arguments"/>
+              <ms-api-variable :append-dialog-to-body="true" :with-mor-setting="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="request.arguments"/>
             </el-tab-pane>
 
             <!--REST 参数-->
@@ -47,7 +47,7 @@
               <el-row>
                 <el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}</el-link>
               </el-row>
-              <ms-api-variable :with-mor-setting="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="request.rest"/>
+              <ms-api-variable :append-dialog-to-body="true" :with-mor-setting="true" :is-read-only="isReadOnly" :isShowEnable="isShowEnable" :parameters="request.rest"/>
             </el-tab-pane>
 
             <!--请求体-->
diff --git a/frontend/src/business/components/api/definition/components/mock/MockTab.vue b/frontend/src/business/components/api/definition/components/mock/MockTab.vue
index 40c5d88612..07c1f8e5b5 100644
--- a/frontend/src/business/components/api/definition/components/mock/MockTab.vue
+++ b/frontend/src/business/components/api/definition/components/mock/MockTab.vue
@@ -12,6 +12,8 @@
         v-loading="result.loading"
         :data="mockConfigData.mockExpectConfigList.filter(data=>!tableSearch || data.name.toLowerCase().includes(tableSearch.toLowerCase()))"
         :operators="operators"
+        :page-size="pageSize"
+        :showSelectAll="false"
         :screen-height="screenHeight"
         @row-click="clickRow"
         row-key="id"
@@ -93,6 +95,7 @@ export default {
       mockConfigData: {},
       tableSearch:"",
       apiParams: [],
+      pageSize: 10,
       screenHeight:document.documentElement.clientHeight - 250,
       operators: [
         {
diff --git a/frontend/src/business/components/common/components/table/MsTable.vue b/frontend/src/business/components/common/components/table/MsTable.vue
index af3f453a9c..02ca7a06ee 100644
--- a/frontend/src/business/components/common/components/table/MsTable.vue
+++ b/frontend/src/business/components/common/components/table/MsTable.vue
@@ -224,6 +224,8 @@ export default {
     rowOrderGroupId: String,
     rowOrderFunc: Function
   },
+  created() {
+  },
   mounted() {
     this.setDefaultOrders();
   },