From 73ed6bef3031989d0e999d2eeff979a8fcbf0f3b Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 13 Feb 2020 12:10:18 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=9B=B6=E5=80=BC=E6=8A=A5=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/InfoView/TaskInfoView.vue |  9 +++++++++
 frontend/src/components/Status/StatusTag.vue      | 13 ++++++++++++-
 frontend/src/i18n/zh.js                           |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/InfoView/TaskInfoView.vue b/frontend/src/components/InfoView/TaskInfoView.vue
index d55945b0..d4b55d68 100644
--- a/frontend/src/components/InfoView/TaskInfoView.vue
+++ b/frontend/src/components/InfoView/TaskInfoView.vue
@@ -17,9 +17,18 @@
             style="margin-left:10px; cursor:pointer;"
           >
             <el-tag type="danger" @click="onClickLogWithErrors">
+              <i class="el-icon-warning"></i>
               {{$t('Log with errors')}}
             </el-tag>
           </el-badge>
+          <el-tag
+            v-if="taskForm.status === 'finished' && taskForm.result_count === 0"
+            type="danger"
+            style="margin-left: 10px"
+          >
+            <i class="el-icon-warning"></i>
+            {{$t('Empty results')}}
+          </el-tag>
         </el-form-item>
         <el-form-item :label="$t('Log File Path')">
           <el-input v-model="taskForm.log_path" placeholder="Log File Path" disabled></el-input>
diff --git a/frontend/src/components/Status/StatusTag.vue b/frontend/src/components/Status/StatusTag.vue
index 1f4f0c89..befe2ab3 100644
--- a/frontend/src/components/Status/StatusTag.vue
+++ b/frontend/src/components/Status/StatusTag.vue
@@ -1,5 +1,6 @@
 <template>
-  <el-tag :type="type">
+  <el-tag :type="type" class="status-tag">
+    <i :class="icon"></i>
     {{$t(label)}}
   </el-tag>
 </template>
@@ -38,6 +39,16 @@ export default {
         return s.label
       }
       return 'NA'
+    },
+    icon () {
+      if (this.status === 'finished') {
+        return 'el-icon-check'
+      } else if (this.status === 'running') {
+        return 'el-icon-loading'
+      } else if (this.status === 'error') {
+        return 'el-icon-error'
+      }
+      return ''
     }
   }
 }
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 5dbf2919..419fcd9d 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -213,6 +213,7 @@ export default {
   'Updating log...': '正在更新日志...',
   'Error Count': '错误数',
   'Log with errors': '日志错误',
+  'Empty results': '空结果',
 
   // 任务列表
   'Node': '节点',

From 6be0ef3adfc384af1b656abf45a6a46a3d8b89c8 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 13 Feb 2020 12:13:20 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/InfoView/TaskInfoView.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/InfoView/TaskInfoView.vue b/frontend/src/components/InfoView/TaskInfoView.vue
index d4b55d68..7e08af8d 100644
--- a/frontend/src/components/InfoView/TaskInfoView.vue
+++ b/frontend/src/components/InfoView/TaskInfoView.vue
@@ -69,7 +69,9 @@
       </el-form>
     </el-row>
     <el-row class="button-container">
-      <el-button v-if="isRunning" type="danger" @click="onStop">{{$t('Stop')}}</el-button>
+      <el-button v-if="isRunning" size="small" type="danger" @click="onStop" icon="el-icon-video-pause">
+        {{$t('Stop')}}
+      </el-button>
       <!--<el-button type="danger" @click="onRestart">Restart</el-button>-->
     </el-row>
   </div>

From d4651a421ff126770d4d9ebee88f5acc5926d761 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 13 Feb 2020 13:42:56 +0800
Subject: [PATCH 3/6] fixed https://github.com/crawlab-team/crawlab/issues/505

---
 frontend/src/views/spider/SpiderList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
index bbfbee75..3a1d38ca 100644
--- a/frontend/src/views/spider/SpiderList.vue
+++ b/frontend/src/views/spider/SpiderList.vue
@@ -399,7 +399,8 @@ export default {
         { name: 'type', label: 'Spider Type', width: '120', sortable: true },
         { name: 'last_status', label: 'Last Status', width: '120' },
         { name: 'last_run_ts', label: 'Last Run', width: '140' },
-        // { name: 'update_ts', label: 'Update Time', width: '140' },
+        { name: 'update_ts', label: 'Update Time', width: '140' },
+        { name: 'create_ts', label: 'Create Time', width: '140' },
         { name: 'remark', label: 'Remark', width: '140' }
       ],
       spiderFormRules: {

From d04c71b7d101cc1ac7168f7f7eabd1599ade79a9 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 13 Feb 2020 13:44:33 +0800
Subject: [PATCH 4/6] updated CHANGELOG

---
 CHANGELOG-zh.md | 1 +
 CHANGELOG.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
index 14f2653c..6ff633ce 100644
--- a/CHANGELOG-zh.md
+++ b/CHANGELOG-zh.md
@@ -4,6 +4,7 @@
 - **日志管理优化**. 日志搜索，错误高亮，自动滚动.
 - **任务执行流程优化**. 允许用户在触发任务后跳转到该任务详情页.
 - **任务展示优化**. 在爬虫详情页的最近任务表格中加入了“参数”列. [#295](https://github.com/crawlab-team/crawlab/issues/295)
+- **爬虫列表优化**. 在爬虫列表页加入"更新时间"和"创建时间". [#505](https://github.com/crawlab-team/crawlab/issues/505)
 
 ### Bug 修复
 - **定时任务配置失去焦点**. [#519](https://github.com/crawlab-team/crawlab/issues/519)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ec1e280..ee8de024 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - **Log Management Optimization**. Log search, error highlight, auto-scrolling.
 - **Task Execution Process Optimization**. Allow users to be redirected to task detail page after triggering a task.
 - **Task Display Optimization**. Added "Param" in the Latest Tasks table in the spider detail page. [#295](https://github.com/crawlab-team/crawlab/issues/295)
+- **Spider List Optimization**. Added "Update Time" and "Create Time" in spider list page.
 
 ### Bug Fixes
 - **Lost Focus in Schedule Configuration**. [#519](https://github.com/crawlab-team/crawlab/issues/519)

From c75bd604fa0cae29f058226b144807e827a17b6c Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 13 Feb 2020 13:45:12 +0800
Subject: [PATCH 5/6] updated version

---
 backend/conf/config.yml | 2 +-
 frontend/package.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/conf/config.yml b/backend/conf/config.yml
index 385834bd..1fa80aeb 100644
--- a/backend/conf/config.yml
+++ b/backend/conf/config.yml
@@ -35,7 +35,7 @@ task:
   workers: 4
 other:
   tmppath: "/tmp"
-version: 0.4.5
+version: 0.4.6
 setting:
   allowRegister: "N"
 notification:
diff --git a/frontend/package.json b/frontend/package.json
index 638189e8..197bde7f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crawlab",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --ip=0.0.0.0 --mode=development",

From 5b6669de5dc5cb8119253745b5cf65742ae3ec2c Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Thu, 13 Feb 2020 13:49:30 +0800
Subject: [PATCH 6/6] updated CHANGELOG

---
 CHANGELOG-zh.md | 2 +-
 CHANGELOG.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
index 6ff633ce..0c8c3646 100644
--- a/CHANGELOG-zh.md
+++ b/CHANGELOG-zh.md
@@ -1,4 +1,4 @@
-# 0.4.6 (未知)
+# 0.4.6 (2020-02-13)
 ### 功能 / 优化
 - **Node.js SDK **. 用户可以将 SDK 应用到他们的 Node.js 爬虫中.
 - **日志管理优化**. 日志搜索，错误高亮，自动滚动.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee8de024..da4c2f77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.4.6 (unkown)
+# 0.4.6 (2020-02-13)
 ### Features / Enhancement
 - **SDK for Node.js**. Users can apply SDK in their Node.js spiders.
 - **Log Management Optimization**. Log search, error highlight, auto-scrolling.