From c17a05fe2f8ad3fa4e76c101328b9a66b2db5fa9 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Fri, 17 Jan 2020 13:43:29 +0800 Subject: [PATCH 1/4] updated readme --- docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index c8d44753..c6c92339 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,12 @@ services: # CRAWLAB_TASK_WORKERS: 4 # number of task executors 任务执行器个数（并行执行任务数） # CRAWLAB_SERVER_LANG_NODE: "Y" # whether to pre-install Node.js 预安装 Node.js 语言环境 # CRAWLAB_SETTING_ALLOWREGISTER: "N" # whether to allow user registration 是否允许用户注册 + # CRAWLAB_NOTIFICATION_MAIL_SERVER: smtp.exmaple.com # STMP server address STMP 服务器地址 + # CRAWLAB_NOTIFICATION_MAIL_PORT: 465 # STMP server port STMP 服务器端口 + # CRAWLAB_NOTIFICATION_MAIL_SENDEREMAIL: admin@exmaple.com # sender email 发送者邮箱 + # CRAWLAB_NOTIFICATION_MAIL_SENDEREIDENTITY: admin@exmaple.com # sender ID 发送者 ID + # CRAWLAB_NOTIFICATION_MAIL_SMTP_USER: username # SMTP username SMTP 用户名 + # CRAWLAB_NOTIFICATION_MAIL_SMTP_PASSWORD: password # SMTP password SMTP 密码 ports: - "8080:8080" # frontend port mapping 前端端口映射 depends_on: From 128df1c4a2f26e1f93915908c7cd98610841bcd0 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Fri, 17 Jan 2020 13:52:52 +0800 Subject: [PATCH 2/4] fixed unable to click crawl button on spider page for configurable spiders --- frontend/src/views/spider/SpiderList.vue | 7 ++----- test/README.md | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 test/README.md diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue index 7275e010..9668d8df 100644 --- a/frontend/src/views/spider/SpiderList.vue +++ b/frontend/src/views/spider/SpiderList.vue @@ -508,11 +508,8 @@ export default { this.dialogVisible = true }, isShowRun (row) { - if (row.cmd) { - return true - } else { - return false - } + if (!this.isCustomized(row)) return true + return !!row.cmd }, isCustomized (row) { return row.type === 'customized' diff --git a/test/README.md b/test/README.md new file mode 100644 index 00000000..392ebe76 --- /dev/null +++ b/test/README.md @@ -0,0 +1,10 @@ +# Test for Crawlab + +## Test Cases + +Test Case | Steps | Expected Results +--- | --- | --- +Login | | +Signup | | +Upload Spider | | +Edit Spider File | | From 4a3d48dde60448a9ec9cc29065e2df409781f91a Mon Sep 17 00:00:00 2001 From: marvzhang Date: Fri, 17 Jan 2020 14:12:53 +0800 Subject: [PATCH 3/4] fixed missing form validation before uploading spider file error --- frontend/src/views/spider/SpiderList.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue index 9668d8df..def443b7 100644 --- a/frontend/src/views/spider/SpiderList.vue +++ b/frontend/src/views/spider/SpiderList.vue @@ -55,7 +55,9 @@ :data="uploadForm" :headers="{Authorization:token}" :on-success="onUploadSuccess" - :file-list="fileList"> + :file-list="fileList" + :before-upload="beforeUpload" + > {{$t('Upload')}} @@ -557,6 +559,17 @@ export default { // navigate to spider detail this.$router.push(`/spiders/${res.data._id}`) }, + beforeUpload (file) { + return new Promise((resolve, reject) => { + this.$refs['addCustomizedForm'].validate(res => { + if (res) { + resolve() + } else { + reject(new Error('form validation error')) + } + }) + }) + }, getTime (str) { if (!str || str.match('^0001')) return 'NA' return dayjs(str).format('YYYY-MM-DD HH:mm:ss') From ca2e77970874cb445eb11c69a179bc08f9ad6a62 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Fri, 17 Jan 2020 14:14:30 +0800 Subject: [PATCH 4/4] updated CHANGELOG --- .gitignore | 3 ++- CHANGELOG-zh.md | 2 ++ CHANGELOG.md | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2c38a7c2..0b6328c9 100644 --- a/.gitignore +++ b/.gitignore @@ -121,4 +121,5 @@ _book/ .idea *.lock -backend/spiders \ No newline at end of file +backend/spiders +spiders/*.zip diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md index d68a833f..d0f85f2a 100644 --- a/CHANGELOG-zh.md +++ b/CHANGELOG-zh.md @@ -12,6 +12,8 @@ ### Bug 修复 - **`nil retuened` 错误**. - **使用 HTTPS 出现的报错**. +- **无法在爬虫列表页运行可配置爬虫**. +- **上传爬虫文件缺少表单验证**. # 0.4.3 (2020-01-07) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b6277e2..c7d5f6e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ ### Bug Fixes - **`nil retuened` error**. - **Error when using HTTPS**. +- **Unable to run Configurable Spiders on Spider List**. +- **Missing form validation before uploading spider files**. # 0.4.3 (2020-01-07)