From 80670adc8c475589e6082c63f1e9a2753f1834bf Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 3 Feb 2020 10:51:11 +0800 Subject: [PATCH 1/5] fixed https://github.com/crawlab-team/crawlab/issues/202 --- frontend/src/components/TableView/GeneralTableView.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/components/TableView/GeneralTableView.vue b/frontend/src/components/TableView/GeneralTableView.vue index 819a0572..a89dcd77 100644 --- a/frontend/src/components/TableView/GeneralTableView.vue +++ b/frontend/src/components/TableView/GeneralTableView.vue @@ -6,6 +6,9 @@ border> From d6d164a4389a2f174288e4dad5e141396b0c315c Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 3 Feb 2020 11:08:01 +0800 Subject: [PATCH 2/5] fixed https://github.com/crawlab-team/crawlab/issues/202 --- backend/utils/model.go | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/backend/utils/model.go b/backend/utils/model.go index 21a295d6..048b0001 100644 --- a/backend/utils/model.go +++ b/backend/utils/model.go @@ -2,9 +2,9 @@ package utils import ( "crawlab/constants" + "encoding/json" "github.com/globalsign/mgo/bson" - "strconv" - "time" + "strings" ) func IsObjectIdNull(id bson.ObjectId) bool { @@ -12,16 +12,13 @@ func IsObjectIdNull(id bson.ObjectId) bool { } func InterfaceToString(value interface{}) string { - switch realValue := value.(type) { - case bson.ObjectId: - return realValue.Hex() - case string: - return realValue - case int: - return strconv.Itoa(realValue) - case time.Time: - return realValue.String() - default: + bytes, err := json.Marshal(value) + if err != nil { return "" } + str := string(bytes) + if strings.HasPrefix(str, "\"") && strings.HasSuffix(str, "\"") { + str = str[1 : len(str)-1] + } + return str } From 4ce65880891ad053b2b52b1098e8636fee6e7ed9 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 3 Feb 2020 11:09:45 +0800 Subject: [PATCH 3/5] updated CHANGELOG --- CHANGELOG-zh.md | 1 + CHANGELOG.md | 1 + .../src/components/TableView/GeneralTableView.vue | 15 +++++++-------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG-zh.md b/CHANGELOG-zh.md index e94ecfbb..a19247d7 100644 --- a/CHANGELOG-zh.md +++ b/CHANGELOG-zh.md @@ -14,6 +14,7 @@ - **下载结果错误**. [#465](https://github.com/crawlab-team/crawlab/issues/465) - **crawlab-sdk CLI 错误**. [#458](https://github.com/crawlab-team/crawlab/issues/458) - **页面刷新问题**. [#441](https://github.com/crawlab-team/crawlab/issues/441) +- **结果不支持 JSON**. [#202](https://github.com/crawlab-team/crawlab/issues/202) - **修复“删除爬虫后获取所有爬虫”错误**. - **修复 i18n 警告**. diff --git a/CHANGELOG.md b/CHANGELOG.md index 07103074..49eba2a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - **Download results error**. [#465](https://github.com/crawlab-team/crawlab/issues/465) - **crawlab-sdk CLI error**. [#458](https://github.com/crawlab-team/crawlab/issues/458) - **Page refresh issue**. [#441](https://github.com/crawlab-team/crawlab/issues/441) +- **Results not support JSON**. [#202](https://github.com/crawlab-team/crawlab/issues/202) - **Getting all spider after deleting a spider**. - **i18n warning**. diff --git a/frontend/src/components/TableView/GeneralTableView.vue b/frontend/src/components/TableView/GeneralTableView.vue index a89dcd77..f6ada7ad 100644 --- a/frontend/src/components/TableView/GeneralTableView.vue +++ b/frontend/src/components/TableView/GeneralTableView.vue @@ -7,7 +7,7 @@ @@ -61,18 +61,17 @@ export default { computed: { filteredData () { return this.data - // .map(d => d) - // .filter((d, index) => { - // // pagination - // const pageNum = this.pageNum - // const pageSize = this.pageSize - // return (pageSize * (pageNum - 1) <= index) && (index < pageSize * pageNum) - // }) } }, methods: { onPageChange () { this.$emit('page-change', { pageNum: this.pageNum, pageSize: this.pageSize }) + }, + getString (value) { + if (value === undefined) return '' + const str = JSON.stringify(value) + if (str.match(/^"(.*)"$/)) return str.match(/^"(.*)"$/)[1] + return str } } } From b83e8d8b4227ddf570f4311e5c0602fef1ce7644 Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 3 Feb 2020 11:24:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BF=87=E9=95=BF=E7=9A=84=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=95=B0=E6=8D=AE=E5=81=9A=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TableView/GeneralTableView.vue | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/TableView/GeneralTableView.vue b/frontend/src/components/TableView/GeneralTableView.vue index f6ada7ad..3f7693f3 100644 --- a/frontend/src/components/TableView/GeneralTableView.vue +++ b/frontend/src/components/TableView/GeneralTableView.vue @@ -7,7 +7,11 @@ @@ -78,5 +82,22 @@ export default { + + From 8fe18e820832ad737c1f8640f47a31354c6e5f5f Mon Sep 17 00:00:00 2001 From: marvzhang Date: Mon, 3 Feb 2020 11:25:03 +0800 Subject: [PATCH 5/5] 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 a19247d7..83440bbb 100644 --- a/CHANGELOG-zh.md +++ b/CHANGELOG-zh.md @@ -6,6 +6,7 @@ - **示例爬虫**. 当初始化时，自动加入示例爬虫. [#379](https://github.com/crawlab-team/crawlab/issues/379) - **用户管理优化**. 限制管理用户的权限. [#456](https://github.com/crawlab-team/crawlab/issues/456) - **设置页面优化**. +- **任务结果页面优化**. ### Bug 修复 - **无法找到爬虫文件错误**. [#485](https://github.com/crawlab-team/crawlab/issues/485) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49eba2a6..4c6c56ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - **Demo Spiders**. Added demo spiders when Crawlab is initialized. [#379](https://github.com/crawlab-team/crawlab/issues/379) - **User Admin Optimization**. Restrict privilleges of admin users. [#456](https://github.com/crawlab-team/crawlab/issues/456) - **Setting Page Optimization**. +- **Task Results Optimization**. ### Bug Fixes - **Unable to find spider file error**. [#485](https://github.com/crawlab-team/crawlab/issues/485)