Merge pull request #433 from crawlab-team/develop

Develop

CHANGELOG-zh.md

@@ -15,6 +15,9 @@
 - **定时任务问题**. [#423](https://github.com/crawlab-team/crawlab/issues/423)
 - **上传爬虫zip文件问题**. [#403](https://github.com/crawlab-team/crawlab/issues/403) [#407](https://github.com/crawlab-team/crawlab/issues/407)
 - **因为网络原因导致崩溃**. [#340](https://github.com/crawlab-team/crawlab/issues/340)
+- **定时任务无法正常运行**
+- **定时任务列表列表错位问题**
+- **刷新按钮跳转错误问题**
 
 # 0.4.2 (2019-12-26)
 ### 功能 / 优化

CHANGELOG.md

@@ -15,6 +15,9 @@
 - **Schedule Cron Task Issue**. [#423](https://github.com/crawlab-team/crawlab/issues/423)
 - **Upload Spider Zip File Issue**. [#403](https://github.com/crawlab-team/crawlab/issues/403) [#407](https://github.com/crawlab-team/crawlab/issues/407)
 - **Exit due to Network Failure**. [#340](https://github.com/crawlab-team/crawlab/issues/340)
+- **Cron Jobs not Running Correctly**
+- **Schedule List Columns Mis-positioned**
+- **Clicking Refresh Button Redirected to 404 Page**
 
 # 0.4.2 (2019-12-26)
 ### Features / Enhancement

backend/services/schedule.go

@@ -39,11 +39,6 @@ func AddScheduleTask(s model.Schedule) func() {
 				if err := AddTask(t); err != nil {
 					return
 				}
-				if err := AssignTask(t); err != nil {
-					log.Errorf(err.Error())
-					debug.PrintStack()
-					return
-				}
 			}
 		} else if s.RunType == constants.RunTypeRandom {
 			// 随机
@@ -57,11 +52,6 @@ func AddScheduleTask(s model.Schedule) func() {
 				debug.PrintStack()
 				return
 			}
-			if err := AssignTask(t); err != nil {
-				log.Errorf(err.Error())
-				debug.PrintStack()
-				return
-			}
 		} else if s.RunType == constants.RunTypeSelectedNodes {
 			// 指定节点
 			for _, nodeId := range s.NodeIds {
@@ -75,33 +65,10 @@ func AddScheduleTask(s model.Schedule) func() {
 				if err := AddTask(t); err != nil {
 					return
 				}
-
-				if err := AssignTask(t); err != nil {
-					log.Errorf(err.Error())
-					debug.PrintStack()
-					return
-				}
 			}
 		} else {
 			return
 		}
-
-		//node, err := model.GetNodeByKey(s.NodeKey)
-		//if err != nil || node.Id.Hex() == "" {
-		//	log.Errorf("get node by key error: %s", err.Error())
-		//	debug.PrintStack()
-		//	return
-		//}
-		//
-		//spider := model.GetSpiderByName(s.SpiderName)
-		//if spider == nil || spider.Id.Hex() == "" {
-		//	log.Errorf("get spider by name error: %s", err.Error())
-		//	debug.PrintStack()
-		//	return
-		//}
-		//
-		//// 同步ID到定时任务
-		//s.SyncNodeIdAndSpiderId(node, *spider)
 	}
 }
 

frontend/src/views/layout/components/Navbar.vue

@@ -40,7 +40,9 @@
         data-color-scheme="no-preference: light; light: light; dark: dark;"
         data-size="large"
         data-show-count="true"
-        :aria-label="$t('Star crawlab-team/crawlab on GitHub')">
+        :aria-label="$t('Star crawlab-team/crawlab on GitHub')"
+        style="color: white"
+      >
         Star
       </github-button>
     </div>

frontend/src/views/layout/components/TagsView.vue

@@ -130,9 +130,10 @@ export default {
     refreshSelectedTag (view) {
       this.$store.dispatch('delCachedView', view).then(() => {
         const { fullPath } = view
+        console.log('fullPath', fullPath)
         this.$nextTick(() => {
           this.$router.replace({
-            path: '/redirect' + fullPath
+            path: fullPath
           })
         })
       })

frontend/src/views/schedule/ScheduleList.vue

@@ -117,7 +117,7 @@
 
       <!--table list-->
       <el-table :data="filteredTableData"
-                class="table"
+                class="table" height="500"
                 :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
                 border>
         <template v-for="col in columns">
@@ -172,7 +172,7 @@
             </template>
           </el-table-column>
         </template>
-        <el-table-column :label="$t('Action')" align="left" width="auto" fixed="right">
+        <el-table-column :label="$t('Action')" align="left" width="130" fixed="right">
           <template slot-scope="scope">
             <!-- 编辑 -->
             <el-tooltip :content="$t('Edit')" placement="top">
@@ -182,9 +182,9 @@
             <el-tooltip :content="$t('Remove')" placement="top">
               <el-button type="danger" icon="el-icon-delete" size="mini" @click="onRemove(scope.row)"></el-button>
             </el-tooltip>
-            <el-tooltip :content="$t(getStatusTooltip(scope.row))" placement="top">
-              <el-button type="success" icon="fa fa-bug" size="mini" @click="onCrawl(scope.row)"></el-button>
-            </el-tooltip>
+            <!--<el-tooltip :content="$t(getStatusTooltip(scope.row))" placement="top">-->
+              <!--<el-button type="success" icon="fa fa-bug" size="mini" @click="onCrawl(scope.row)"></el-button>-->
+            <!--</el-tooltip>-->
           </template>
         </el-table-column>
       </el-table>