From 93e6e5c8a8a372a83a1c1985bed8146480319c1d Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Tue, 11 Feb 2020 15:51:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/setting/Setting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/setting/Setting.vue b/frontend/src/views/setting/Setting.vue
index 3832388d..c341ccb7 100644
--- a/frontend/src/views/setting/Setting.vue
+++ b/frontend/src/views/setting/Setting.vue
@@ -31,7 +31,7 @@
       </el-form>
     </el-dialog>
 
-    <el-tabs v-model="activeName" @tab-click="tabActiveHandle">
+    <el-tabs v-model="activeName" @tab-click="tabActiveHandle" type="border-card">
       <el-tab-pane :label="$t('General')" name="general">
         <el-form :model="userInfo" class="setting-form" ref="setting-form" label-width="200px" :rules="rules"
                  inline-message>

From f3b8bcc51050429d004d266a0aec5fb4004bc020 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Tue, 11 Feb 2020 17:47:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ScrollView/LogItem.vue     | 15 +++++-
 .../src/components/ScrollView/LogView.vue     | 53 ++++++++++++++-----
 frontend/src/i18n/zh.js                       |  1 +
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/ScrollView/LogItem.vue b/frontend/src/components/ScrollView/LogItem.vue
index 19e3e082..4e679eef 100644
--- a/frontend/src/components/ScrollView/LogItem.vue
+++ b/frontend/src/components/ScrollView/LogItem.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="log-item">
     <div class="line-no">{{index}}</div>
-    <div class="line-content" ><span v-if="isAnsi" v-html="data">{{data}}</span><span v-else="">{{data}}</span></div>
+    <div class="line-content">
+      <span v-if="isAnsi" v-html="dataHtml"></span>
+      <span v-else="" v-html="dataHtml"></span>
+    </div>
   </div>
 </template>
 
@@ -20,6 +23,16 @@ export default {
     isAnsi: {
       type: Boolean,
       default: false
+    },
+    searchString: {
+      type: String,
+      default: ''
+    }
+  },
+  computed: {
+    dataHtml () {
+      if (!this.searchString) return this.data
+      return this.data.replace(new RegExp(`(${this.searchString})`, 'gi'), '<mark>$1</mark>')
     }
   }
 }
diff --git a/frontend/src/components/ScrollView/LogView.vue b/frontend/src/components/ScrollView/LogView.vue
index c4c20228..4998917d 100644
--- a/frontend/src/components/ScrollView/LogView.vue
+++ b/frontend/src/components/ScrollView/LogView.vue
@@ -1,13 +1,22 @@
 <template>
-  <virtual-list
-    class="log-view"
-    :size="6"
-    :remain="100"
-    :item="item"
-    :itemcount="logData.length"
-    :itemprops="getItemProps"
-  >
-  </virtual-list>
+  <div class="log-view-wrapper">
+    <div class="filter-wrapper">
+      <el-input
+        v-model="searchString"
+        suffix-icon="el-icon-search"
+        :placeholder="$t('Search Log')"
+        style="width: 240px"
+      />
+    </div>
+    <virtual-list
+      class="log-view"
+      :size="6"
+      :remain="100"
+      :item="item"
+      :itemcount="filteredLogData.length"
+      :itemprops="getItemProps"
+    />
+  </div>
 </template>
 
 <script>
@@ -15,6 +24,7 @@ import LogItem from './LogItem'
 import VirtualList from 'vue-virtual-scroll-list'
 import Convert from 'ansi-to-html'
 import hasAnsi from 'has-ansi'
+
 const convert = new Convert()
 export default {
   name: 'LogView',
@@ -29,7 +39,8 @@ export default {
   },
   data () {
     return {
-      item: LogItem
+      item: LogItem,
+      searchString: ''
     }
   },
   computed: {
@@ -41,11 +52,22 @@ export default {
             data: d
           }
         })
+    },
+    filteredLogData () {
+      return this.logData.filter(d => {
+        if (!this.searchString) return true
+        return !!d.data.toLowerCase().match(this.searchString.toLowerCase())
+      })
+    }
+  },
+  watch: {
+    searchString () {
+      this.$st.sendEv('任务详情', '日志', '搜索日志')
     }
   },
   methods: {
     getItemProps (index) {
-      const logItem = this.logData[index]
+      const logItem = this.filteredLogData[index]
       const isAnsi = hasAnsi(logItem.data)
       return {
         // <item/> will render with itemProps.
@@ -53,6 +75,7 @@ export default {
         props: {
           index: logItem.index,
           data: isAnsi ? convert.toHtml(logItem.data) : logItem.data,
+          searchString: this.searchString,
           isAnsi
         }
       }
@@ -65,12 +88,14 @@ export default {
 
 <style scoped>
   .log-view {
-    margin-top: 0!important;
-    min-height: 100%;
-    overflow-y: scroll!important;
+    margin-top: 0 !important;
+    overflow-y: scroll !important;
     list-style: none;
     color: #A9B7C6;
     background: #2B2B2B;
   }
 
+  .filter-wrapper {
+    margin-bottom: 10px;
+  }
 </style>
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 9b1fc883..4ff4cd13 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -208,6 +208,7 @@ export default {
   'Run Type': '运行类型',
   'Random': '随机',
   'Selected Nodes': '指定节点',
+  'Search Log': '搜索日志',
 
   // 任务列表
   'Node': '节点',