From 88b6e5b36666e2224f10a7deb5b8ede96cd442c4 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 24 Feb 2020 11:35:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/Settings/GitSettings.vue | 4 ++++ 1 file changed, 4 insertions(+) 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 () { From 0a225690a27244bd0656813c2db80ee08012c468 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 24 Feb 2020 11:37:50 +0800 Subject: [PATCH 2/6] updated dockerpush.yml --- .github/workflows/dockerpush.yml | 2 +- CHANGELOG-zh.md | 2 +- CHANGELOG.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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..e6cb2035 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. diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d4bb06b..6dfabc0a 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. From f997ea775f2a73799588c9d978050f465d7e7f9c Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 24 Feb 2020 11:48:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89=E4=B8=8D=E5=85=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/task/TaskList.vue | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) 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 @@ - + @@ -331,7 +335,8 @@ export default { message: resp.data.error }) }) - }).catch(() => {}) + }).catch(() => { + }) }, onRemove (row, ev) { ev.stopPropagation() From aea71cbbb5138f9706dd0b3d606e7bee942e6daf Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 24 Feb 2020 11:48:56 +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 e6cb2035..c28063d6 100644 --- a/CHANGELOG-zh.md +++ b/CHANGELOG-zh.md @@ -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 6dfabc0a..0e1e1e52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From c2ccbb6bcd0922264aed3d485edf16ec518bdbf4 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 24 Feb 2020 11:53:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AF=BC=E8=88=AA=E4=B8=8D=E5=AF=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/Overview/TaskOverview.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Overview/TaskOverview.vue b/frontend/src/components/Overview/TaskOverview.vue index 8cd05d1d..762d64c5 100644 --- a/frontend/src/components/Overview/TaskOverview.vue +++ b/frontend/src/components/Overview/TaskOverview.vue @@ -70,11 +70,11 @@ export default { }, methods: { onNavigateToSpider () { - this.$router.push(`/nodes/${this.nodeForm._id}`) + this.$router.push(`/spiders/${this.spiderForm._id}`) this.$st.sendEv('任务详情', '概览', '点击节点详情') }, onNavigateToNode () { - this.$router.push(`/spiders/${this.spiderForm._id}`) + this.$router.push(`/nodes/${this.nodeForm._id}`) this.$st.sendEv('任务详情', '概览', '点击爬虫详情') } }, From bca567206ef43ba687fd51057ec93b825844a1a1 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 24 Feb 2020 11:53:32 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AF=BC=E8=88=AA=E4=B8=8D=E5=AF=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/Overview/TaskOverview.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Overview/TaskOverview.vue b/frontend/src/components/Overview/TaskOverview.vue index 762d64c5..0f34687c 100644 --- a/frontend/src/components/Overview/TaskOverview.vue +++ b/frontend/src/components/Overview/TaskOverview.vue @@ -71,11 +71,11 @@ export default { methods: { onNavigateToSpider () { this.$router.push(`/spiders/${this.spiderForm._id}`) - this.$st.sendEv('任务详情', '概览', '点击节点详情') + this.$st.sendEv('任务详情', '概览', '点击爬虫详情') }, onNavigateToNode () { this.$router.push(`/nodes/${this.nodeForm._id}`) - this.$st.sendEv('任务详情', '概览', '点击爬虫详情') + this.$st.sendEv('任务详情', '概览', '点击节点详情') } }, created () {