Merge pull request #550 from crawlab-team/develop

Develop

CHANGELOG-zh.md

@@ -1,9 +1,10 @@
-# 0.4.6 (未知)
+# 0.4.6 (2020-02-13)
 ### 功能 / 优化
 - **Node.js SDK **. 用户可以将 SDK 应用到他们的 Node.js 爬虫中.
 - **日志管理优化**. 日志搜索，错误高亮，自动滚动.
 - **任务执行流程优化**. 允许用户在触发任务后跳转到该任务详情页.
 - **任务展示优化**. 在爬虫详情页的最近任务表格中加入了“参数”列. [#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)

CHANGELOG.md

@@ -1,9 +1,10 @@
-# 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.
 - **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)

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:

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",

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>
@@ -60,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>

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 ''
     }
   }
 }

frontend/src/i18n/zh.js

@@ -213,6 +213,7 @@ export default {
   'Updating log...': '正在更新日志...',
   'Error Count': '错误数',
   'Log with errors': '日志错误',
+  'Empty results': '空结果',
 
   // 任务列表
   'Node': '节点',

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: {