From 937ce3f3c6af140c14b8531e6940d228a9931830 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 3 Feb 2021 17:21:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20jar=E5=8C=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/test/components/jar/JarConfig.vue     | 51 +++++++++++--------
 .../api/test/components/jar/JarSearchBar.vue  | 16 ++----
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/jar/JarConfig.vue b/frontend/src/business/components/api/test/components/jar/JarConfig.vue
index 2c186ea80a..a755a8463d 100644
--- a/frontend/src/business/components/api/test/components/jar/JarConfig.vue
+++ b/frontend/src/business/components/api/test/components/jar/JarConfig.vue
@@ -2,28 +2,32 @@
   <el-dialog width="50%" :close-on-click-modal="false" :title="$t('api_test.jar_config.title')" :visible.sync="visible" class="jar-import" @close="close">
     <div v-loading="result.loading">
       <ms-jar-config-from :config="currentConfig" :callback="saveConfig" ref="jarConfigFrom" :read-only="isReadOnly"/>
-      <ms-jar-search-bar @refresh="getJarConfigs" :table-data="configs" ref="jarSearchBar"/>
+      <ms-jar-search-bar v-if="(!isSearchBarQuery && configs.length > 0) || isSearchBarQuery" :condition="condition"
+                         @search="getJarConfigs" :table-data="configs" ref="jarSearchBar"/>
       <ms-jar-config-list @refresh="getJarConfigs" v-if="configs.length > 0" @rowSelect="rowSelect" :table-data="configs" ref="jarConfigList"/>
     </div>
   </el-dialog>
 </template>
 
 <script>
-    import MsDialogFooter from "../../../../common/components/MsDialogFooter";
-    import {listenGoBack, removeGoBackListener} from "../../../../../../common/js/utils";
-    import MsJarConfigList from "./JarConfigList";
-    import MsJarConfigFrom from "./JarConfigFrom";
-    import MsJarSearchBar from "./JarSearchBar";
-    export default {
-      name: "MsJarConfig",
-      components: {MsJarConfigFrom, MsJarSearchBar, MsJarConfigList, MsDialogFooter},
-      data() {
-        return {
-          visible: false,
-          result: {},
-          currentConfig: {},
-          configs: []
-        }
+import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+import {listenGoBack, removeGoBackListener} from "../../../../../../common/js/utils";
+import MsJarConfigList from "./JarConfigList";
+import MsJarConfigFrom from "./JarConfigFrom";
+import MsJarSearchBar from "./JarSearchBar";
+
+export default {
+  name: "MsJarConfig",
+  components: {MsJarConfigFrom, MsJarSearchBar, MsJarConfigList, MsDialogFooter},
+  data() {
+    return {
+      visible: false,
+      result: {},
+      currentConfig: {},
+      configs: [],
+      condition: {},
+      isSearchBarQuery: false
+    }
       },
       props: {
         isReadOnly: {
@@ -34,6 +38,8 @@
       methods: {
         open() {
           this.visible = true;
+          this.condition = {};
+
           this.getJarConfigs();
           listenGoBack(this.close);
         },
@@ -54,11 +60,14 @@
             this.getJarConfigs();
           });
         },
-        getJarConfigs(condition) {
-            this.result = this.$post("/jar/list", {name: condition}, response => {
-              this.configs = response.data;
-              this.currentConfig = {};
-            });
+        getJarConfigs(isSearchBarQuery) {
+          if (isSearchBarQuery) {
+            this.isSearchBarQuery = isSearchBarQuery;
+          }
+          this.result = this.$post("/jar/list", this.condition, response => {
+            this.configs = response.data;
+            this.currentConfig = {};
+          });
         },
         rowSelect(config) {
           this.currentConfig = config;
diff --git a/frontend/src/business/components/api/test/components/jar/JarSearchBar.vue b/frontend/src/business/components/api/test/components/jar/JarSearchBar.vue
index 1b2072e1a9..53125bcf17 100644
--- a/frontend/src/business/components/api/test/components/jar/JarSearchBar.vue
+++ b/frontend/src/business/components/api/test/components/jar/JarSearchBar.vue
@@ -1,10 +1,10 @@
 <template>
   <el-input class="jar-header-search"
-            v-model="searchCondition"
+            v-model="condition.name"
             type="text"
             size="small"
             prefix-icon="el-icon-search"
-            @keyup.enter.native="search"
+            @blur="search"
             :placeholder="$t('project.search_by_name_jar')" clearable/>
 </template>
 
@@ -19,19 +19,9 @@
           },
         },
       },
-      data() {
-        return {
-          searchCondition: this.condition
-        };
-      },
-      watch: {
-        inputCondition(value) {
-          this.searchCondition = value;
-        }
-      },
       methods: {
         search() {
-          this.$emit('refresh', this.searchCondition);
+          this.$emit('search', true);
         }
       },
     }