From df809f6e6003a9a002409cfac76bf46f220a2899 Mon Sep 17 00:00:00 2001 From: jebbs Date: Thu, 27 Sep 2018 16:40:05 +0800 Subject: [PATCH] use all values of ExractResult --- scripts/extract.js | 2 +- scripts/result.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/extract.js b/scripts/extract.js index 855d438..bfe2900 100644 --- a/scripts/extract.js +++ b/scripts/extract.js @@ -28,7 +28,7 @@ async function getData(itemsSelector, fieldSelectors, ...args) { if (arg instanceof Array) { urls = arg; } else if (arg instanceof ExractResult) { - urls = arg.column(0); + urls = arg.squash().filter(v=>!!v); } else { let urlTempl = arg; if (urlTempl) { diff --git a/scripts/result.js b/scripts/result.js index 7e26614..74a7a96 100644 --- a/scripts/result.js +++ b/scripts/result.js @@ -11,6 +11,9 @@ class ExractResult { i => this._data[i][index] ); } + squash() { + return this._data.reduce((p, c) => p.concat(c), []); + } get data() { return this._data; }