From 988615337e6ed5ba2acb3ab19ed0123c3bdd919d Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 4 Jan 2023 15:58:42 +0800
Subject: [PATCH] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9mqtt=E6=8F=92=E4=BB=B6=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/PluginContentAssertions.vue     | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/api-test/frontend/src/business/automation/scenario/component/PluginContentAssertions.vue b/api-test/frontend/src/business/automation/scenario/component/PluginContentAssertions.vue
index 25f65f1cd2..e187dbb77c 100644
--- a/api-test/frontend/src/business/automation/scenario/component/PluginContentAssertions.vue
+++ b/api-test/frontend/src/business/automation/scenario/component/PluginContentAssertions.vue
@@ -44,7 +44,7 @@
           <div v-for="(data, index) in value.list" :key="index">
             <el-col name="itemOptions">
               <div v-if="data.type === options.TEXT" class="assertion-item-editing">
-                <el-row :gutter="10" type="flex" justify="space-between" align="middle">
+                <el-row :gutter="10" class="assertion-item-row">
                   <el-col class="ms-assertion-select">
                     <el-select
                       :disabled="true"
@@ -52,9 +52,6 @@
                       v-model="data.type"
                       :placeholder="$t('api_test.request.assertions.select_type')"
                       size="small">
-                      <el-option :label="$t('api_test.request.assertions.text')" :value="options.TEXT" />
-                      <el-option :label="'JSONPath'" :value="options.JSON_PATH" />
-                      <el-option :label="'XPath'" :value="options.XPATH2" />
                     </el-select>
                   </el-col>
                   <el-col class="ms-assertion-select">
@@ -79,9 +76,9 @@
                       size="small"
                       show-word-limit
                       :placeholder="$t('api_test.request.assertions.value')"
-                      width="500px" />
+                    />
                   </el-col>
-                  <el-col class="assertion-btn">
+                  <el-col style="width: 10%;min-width: 80px">
                     <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top">
                       <el-switch
                         v-model="data.enable"
@@ -103,7 +100,7 @@
               </div>
 
               <div v-if="data.type === options.JSON_PATH" class="assertion-item-editing">
-                <el-row :gutter="10" type="flex" justify="space-between" align="middle">
+                <el-row :gutter="10" class="assertion-item-row">
                   <el-col class="ms-assertion-select">
                     <el-select
                       :disabled="true"
@@ -111,9 +108,6 @@
                       v-model="data.type"
                       :placeholder="$t('api_test.request.assertions.select_type')"
                       size="small">
-                      <el-option :label="$t('api_test.request.assertions.text')" :value="options.TEXT" />
-                      <el-option :label="'JSONPath'" :value="options.JSON_PATH" />
-                      <el-option :label="'XPath'" :value="options.XPATH2" />
                     </el-select>
                   </el-col>
                   <el-col>
@@ -125,12 +119,12 @@
                       show-word-limit
                       :placeholder="$t('api_test.request.extract.json_path_expression')" />
                   </el-col>
-                  <el-col>
+                  <el-col style="display: flex; align-items: center;">
                     <el-select
                       v-model="data.option"
                       class="ms-col-type"
                       size="small"
-                      style="width: 100px; margin-right: 10px"
+                      style="width: 120px; margin-right: 10px; min-width: 100px"
                       @change="reload">
                       <el-option :label="$t('api_test.request.assertions.contains')" value="CONTAINS" />
                       <el-option :label="$t('api_test.request.assertions.not_contains')" value="NOT_CONTAINS" />
@@ -146,7 +140,7 @@
                       size="small"
                       show-word-limit
                       :placeholder="$t('api_test.request.assertions.expect')"
-                      style="width: 50%" />
+                    />
                     <el-tooltip placement="top" v-if="data.option === 'REGEX'">
                       <div slot="content">
                         {{ $t('api_test.request.assertions.regex_info') }}
@@ -154,7 +148,7 @@
                       <i class="el-icon-question" style="cursor: pointer" />
                     </el-tooltip>
                   </el-col>
-                  <el-col class="assertion-btn">
+                  <el-col style="width: 17%;min-width: 80px">
                     <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top">
                       <el-switch
                         v-model="data.enable"
@@ -175,7 +169,7 @@
               </div>
 
               <div v-if="data.type === options.XPATH2" class="assertion-item-editing">
-                <el-row :gutter="10" type="flex" justify="space-between" align="middle">
+                <el-row :gutter="10" class="assertion-item-row">
                   <el-col class="ms-assertion-select">
                     <el-select
                       :disabled="true"
@@ -183,9 +177,6 @@
                       v-model="data.type"
                       :placeholder="$t('api_test.request.assertions.select_type')"
                       size="small">
-                      <el-option :label="$t('api_test.request.assertions.text')" :value="options.TEXT" />
-                      <el-option :label="'JSONPath'" :value="options.JSON_PATH" />
-                      <el-option :label="'XPath'" :value="options.XPATH2" />
                     </el-select>
                   </el-col>
                   <el-col>
@@ -197,7 +188,7 @@
                       show-word-limit
                       :placeholder="$t('api_test.request.extract.xpath_expression')" />
                   </el-col>
-                  <el-col class="assertion-btn">
+                  <el-col style="width: 9%;min-width: 80px">
                     <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top">
                       <el-switch
                         v-model="data.enable"
@@ -349,7 +340,6 @@ export default {
 <style scoped>
 .ms-assertion-item {
   width: 100%;
-  height: 32px;
 }
 
 .ms-top-line-box {
@@ -370,6 +360,11 @@ export default {
   margin-top: 10px;
 }
 
+.assertion-item-row {
+  display: flex;
+  align-items: center;
+}
+
 :deep(.ms-assertion-select) {
   width: 140px;
 }
@@ -377,8 +372,4 @@ export default {
 .enable-switch {
   margin-right: 10px;
 }
-
-.assertion-btn {
-  width: 60px;
-}
 </style>