From 7ed8c36667296e026b9bf349b0c2e6b3d5bfd048 Mon Sep 17 00:00:00 2001 From: licong Date: Mon, 13 May 2019 11:48:15 +0800 Subject: [PATCH 1/2] resolve #68, #66 --- api/requirements.txt | 1 + web/src/index/component/sidebar.js | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/requirements.txt b/api/requirements.txt index fe6b06a..7c78ce6 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,3 +1,4 @@ +click==6.7 # don't change the order, latest click lib has a critical bug requests==2.12.4 # don't change the order, latest requests lib has a critical bug Flask-SQLAlchemy>=2.3.2 Flask-RESTful>=0.3.6 diff --git a/web/src/index/component/sidebar.js b/web/src/index/component/sidebar.js index fa24ff9..72342e5 100755 --- a/web/src/index/component/sidebar.js +++ b/web/src/index/component/sidebar.js @@ -148,10 +148,13 @@ export default class Sidebar extends Component { } } let firstDataName = list[0].name; - let nextDataName = list[index + 1].name; + let nextDataName = null; let nextUrl = ''; + if (index < list.length - 1){ + nextDataName = list[index + 1].name; + } if (nextDataName) { - nextUrl = '/home/' + nextDataName; + nextUrl = '/home/' + nextDataName; } else { if (firstDataName) { From 5de4e50f78d19a3a74843eb37ce7e220b0b2867b Mon Sep 17 00:00:00 2001 From: licong Date: Mon, 13 May 2019 11:50:54 +0800 Subject: [PATCH 2/2] resolve #68, #66 --- web/src/index/component/sidebar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/index/component/sidebar.js b/web/src/index/component/sidebar.js index 72342e5..f92d6e3 100755 --- a/web/src/index/component/sidebar.js +++ b/web/src/index/component/sidebar.js @@ -151,10 +151,10 @@ export default class Sidebar extends Component { let nextDataName = null; let nextUrl = ''; if (index < list.length - 1){ - nextDataName = list[index + 1].name; + nextDataName = list[index + 1].name; } if (nextDataName) { - nextUrl = '/home/' + nextDataName; + nextUrl = '/home/' + nextDataName; } else { if (firstDataName) {