From 4945e0b01f1421c68fea11d97e185428dc7b256e Mon Sep 17 00:00:00 2001
From: MeterSphere Bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Tue, 20 Sep 2022 19:48:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9=E5=AF=BC=E5=87=BA=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=20(#18109)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017017 --user=王孝刚 【接口测试】接口自动化场景变量不勾选变量点击导出提示信息错误
https://www.tapd.cn/55049933/s/1247845

Co-authored-by: wxg0103 <727495428@qq.com>
---
 .../scenario/variable/VariableList.vue        | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
index 22b0634fc8..e66719e590 100644
--- a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
+++ b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
@@ -60,61 +60,61 @@
                 <el-col :span="12">
                   <div style="border:1px #DCDFE6 solid; min-height: 400px;border-radius: 4px ;width: 100% ;">
                     <ms-table
-                      v-loading="loading"
-                      row-key="id"
-                      :data="variables"
-                      :total="variables.length"
-                      :screen-height="screenHeight"
-                      :batch-operators="batchButtons"
-                      :remember-order="true"
-                      :highlightCurrentRow="true"
-                      :fields.sync="fields"
-                      :field-key="tableHeaderKey"
-                      @handleRowClick="handleRowClick"
-                      @refresh="onChange"
-                      ref="variableTable">
+                        ref="variableTable"
+                        v-loading="loading"
+                        :batch-operators="batchButtons"
+                        :data="variables"
+                        :field-key="tableHeaderKey"
+                        :fields.sync="fields"
+                        :highlightCurrentRow="true"
+                        :remember-order="true"
+                        :screen-height="screenHeight"
+                        :total="variables.length"
+                        row-key="id"
+                        @handleRowClick="handleRowClick"
+                        @refresh="onChange">
                           <span v-for="item in fields" :key="item.key">
                             <ms-table-column
-                              prop="num"
-                              :field="item"
-                              :fields-width="fieldsWidth"
-                              sortable
-                              label="ID"
-                              min-width="60">
+                                :field="item"
+                                :fields-width="fieldsWidth"
+                                label="ID"
+                                min-width="60"
+                                prop="num"
+                                sortable>
                             </ms-table-column>
                             <ms-table-column
-                              prop="name"
-                              :field="item"
-                              :fields-width="fieldsWidth"
-                              :label="$t('api_test.variable_name')"
-                              min-width="100"
-                              sortable>
+                                :field="item"
+                                :fields-width="fieldsWidth"
+                                :label="$t('api_test.variable_name')"
+                                min-width="100"
+                                prop="name"
+                                sortable>
                             </ms-table-column>
                             <ms-table-column
-                              prop="type"
-                              :field="item"
-                              :fields-width="fieldsWidth"
-                              :label="$t('test_track.case.type')"
-                              min-width="70"
-                              sortable>
+                                :field="item"
+                                :fields-width="fieldsWidth"
+                                :label="$t('test_track.case.type')"
+                                min-width="70"
+                                prop="type"
+                                sortable>
                               <template v-slot:default="scope">
                                 <span>{{ types.get(scope.row.type) }}</span>
                               </template>
                             </ms-table-column>
                             <ms-table-column
-                              prop="value"
-                              :field="item"
-                              :fields-width="fieldsWidth"
-                              :label="$t('api_test.value')"
-                              sortable>
+                                :field="item"
+                                :fields-width="fieldsWidth"
+                                :label="$t('api_test.value')"
+                                prop="value"
+                                sortable>
                             </ms-table-column>
                             <ms-table-column
-                              prop="description"
-                              :field="item"
-                              :fields-width="fieldsWidth"
-                              :label="$t('commons.description')"
-                              min-width="70"
-                              sortable>
+                                :field="item"
+                                :fields-width="fieldsWidth"
+                                :label="$t('commons.description')"
+                                min-width="70"
+                                prop="description"
+                                sortable>
                             </ms-table-column>
                           </span>
                     </ms-table>
@@ -276,7 +276,7 @@ export default {
     },
     exportVariable() {
       if (this.$refs.variableTable.selectIds.length < 1) {
-        this.$warning(this.$t('api_test.environment.select_environment'));
+        this.$warning(this.$t('api_test.environment.select_variable'));
         return;
       }
       let variablesJson = [];
@@ -564,7 +564,7 @@ export default {
       this.variables.forEach(item => {
         if (this.searchType && this.searchType != "" && this.selectVariable && this.selectVariable != "") {
           if ((item.type && item.type.toLowerCase().indexOf(this.searchType.toLowerCase()) == -1 && this.searchType != 'ALL')
-            || (item.name && item.name.toLowerCase().indexOf(this.selectVariable.toLowerCase()) == -1)) {
+              || (item.name && item.name.toLowerCase().indexOf(this.selectVariable.toLowerCase()) == -1)) {
             item.hidden = true;
           } else {
             item.hidden = undefined;