diff --git a/.github/workflows/dockerpush.yml b/.github/workflows/dockerpush.yml
index f85e6d37..5365bbda 100644
--- a/.github/workflows/dockerpush.yml
+++ b/.github/workflows/dockerpush.yml
@@ -57,7 +57,7 @@ jobs:
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
- if [ $VERSION == "release"]; then
+ if [ "$VERSION" == "release" ]; then
apt-get install -y curl
curl ${{ secrets.JENKINS_RELEASE_URL }}
fi
diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md
index c963f207..c28063d6 100644
--- a/CHANGELOG-zh.md
+++ b/CHANGELOG-zh.md
@@ -1,4 +1,4 @@
-# 0.4.7 (unknown)
+# 0.4.7 (2020-02-24)
### 功能 / 优化
- **更好的支持 Scrapy**. 爬虫识别,`settings.py` 配置,日志级别选择,爬虫选择. [#435](https://github.com/crawlab-team/crawlab/issues/435)
- **Git 同步**. 允许用户将 Git 项目同步到 Crawlab.
@@ -13,6 +13,7 @@
- **定时任务爬虫选择问题**. 字段不会随着爬虫变化而响应.
- **定时任务冲突问题**. 两个不同的爬虫设置定时任务,时间设置成相同的话,可能会有bug. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
- **任务日志问题**. 在同一时间触发的不同任务可能会写入同一个日志文件. [#577](https://github.com/crawlab-team/crawlab/issues/577)
+- **任务列表筛选选项不全**.
# 0.4.6 (2020-02-13)
### 功能 / 优化
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d4bb06b..0e1e1e52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.4.7 (unknown)
+# 0.4.7 (2020-02-24)
### Features / Enhancement
- **Better Support for Scrapy**. Spiders identification, `settings.py` configuration, log level selection, spider selection. [#435](https://github.com/crawlab-team/crawlab/issues/435)
- **Git Sync**. Allow users to sync git projects to Crawlab.
@@ -13,6 +13,7 @@
- **Schedule Spider Selection Issue**. Fields not responding to spider change.
- **Cron Jobs Conflict**. Possible bug when two spiders set to the same time of their cron jobs. [#515](https://github.com/crawlab-team/crawlab/issues/515) [#565](https://github.com/crawlab-team/crawlab/issues/565)
- **Task Log Issue**. Different tasks write to the same log file if triggered at the same time. [#577](https://github.com/crawlab-team/crawlab/issues/577)
+- **Task List Filter Options Incomplete**.
# 0.4.6 (2020-02-13)
### Features / Enhancement
diff --git a/frontend/src/components/Overview/TaskOverview.vue b/frontend/src/components/Overview/TaskOverview.vue
index 8cd05d1d..0f34687c 100644
--- a/frontend/src/components/Overview/TaskOverview.vue
+++ b/frontend/src/components/Overview/TaskOverview.vue
@@ -70,12 +70,12 @@ export default {
},
methods: {
onNavigateToSpider () {
- this.$router.push(`/nodes/${this.nodeForm._id}`)
- this.$st.sendEv('任务详情', '概览', '点击节点详情')
- },
- onNavigateToNode () {
this.$router.push(`/spiders/${this.spiderForm._id}`)
this.$st.sendEv('任务详情', '概览', '点击爬虫详情')
+ },
+ onNavigateToNode () {
+ this.$router.push(`/nodes/${this.nodeForm._id}`)
+ this.$st.sendEv('任务详情', '概览', '点击节点详情')
}
},
created () {
diff --git a/frontend/src/components/Settings/GitSettings.vue b/frontend/src/components/Settings/GitSettings.vue
index 939c0a71..4a8c791b 100644
--- a/frontend/src/components/Settings/GitSettings.vue
+++ b/frontend/src/components/Settings/GitSettings.vue
@@ -219,6 +219,7 @@ export default {
this.isGitSyncLoading = false
await this.$store.dispatch('spider/getSpiderData', this.$route.params.id)
}
+ this.$st.sendEv('爬虫详情', 'Git 设置', '同步')
},
onReset () {
this.$confirm(
@@ -235,11 +236,13 @@ export default {
const res = await this.$request.post(`/spiders/${this.spiderForm._id}/git/reset`)
if (!res.data.error) {
this.$message.success(this.$t('Git has been reset successfully'))
+ this.$st.sendEv('爬虫详情', 'Git 设置', '确认重置')
}
} finally {
this.isGitResetLoading = false
}
})
+ this.$st.sendEv('爬虫详情', 'Git 设置', '点击重置')
},
async getSshPublicKey () {
const res = await this.$request.get('/git/public-key')
@@ -251,6 +254,7 @@ export default {
el.setSelectionRange(0, this.sshPublicKey.length)
document.execCommand('copy')
this.$message.success(this.$t('SSH Public Key is copied to the clipboard'))
+ this.$st.sendEv('爬虫详情', 'Git 设置', '拷贝 SSH 公钥')
}
},
async created () {
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index f10ea5ea..98b720b3 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -29,10 +29,12 @@
-
+
+
+
@@ -50,14 +52,15 @@
-
+
@@ -146,7 +149,8 @@
-
+
@@ -331,7 +335,8 @@ export default {
message: resp.data.error
})
})
- }).catch(() => {})
+ }).catch(() => {
+ })
},
onRemove (row, ev) {
ev.stopPropagation()