From 769ff4945185faf8c3b0a19f2ee502f9fb76265e Mon Sep 17 00:00:00 2001 From: deartibers <947466799@qq.com> Date: Thu, 30 Jun 2022 13:38:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/client/src/index.less | 2 +- .../src/layout/components/sider/index.jsx | 23 ++++++++----------- code/VideoAccess-VCMP/web/package.json | 2 ++ code/VideoAccess-VCMP/web/webpack.config.js | 8 ++++++- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/code/VideoAccess-VCMP/web/client/src/index.less b/code/VideoAccess-VCMP/web/client/src/index.less index a4b488c..967c98a 100644 --- a/code/VideoAccess-VCMP/web/client/src/index.less +++ b/code/VideoAccess-VCMP/web/client/src/index.less @@ -1,5 +1,5 @@ // webpack （vite 用 alias 兼容了） -@import '~@douyinfe/semi-ui/dist/css/semi.min.css'; +// @import '~@douyinfe/semi-ui/dist/css/semi.min.css'; @import '~perfect-scrollbar/css/perfect-scrollbar.css'; @import '~nprogress/nprogress.css'; diff --git a/code/VideoAccess-VCMP/web/client/src/layout/components/sider/index.jsx b/code/VideoAccess-VCMP/web/client/src/layout/components/sider/index.jsx index f2412d5..5a4f317 100644 --- a/code/VideoAccess-VCMP/web/client/src/layout/components/sider/index.jsx +++ b/code/VideoAccess-VCMP/web/client/src/layout/components/sider/index.jsx @@ -3,6 +3,7 @@ import PerfectScrollbar from 'perfect-scrollbar'; import { connect } from 'react-redux'; import { Nav } from '@douyinfe/semi-ui'; import { push } from 'react-router-redux'; +import { useLocation } from 'react-router'; let scrollbar = null const homePath = '/equipmentWarehouse/nvr' @@ -45,7 +46,6 @@ const Sider = props => { } } } - console.log(nextItems) setItems(nextItems) const { selectedKeys, openKeys } = initKeys( @@ -74,9 +74,9 @@ const Sider = props => { dispatch(push(homePath)) } }, []) - + let routeSelectedKey = [useLocation().pathname.split('/')[1]]//没有子目录的 + let routeSelectedKeys = [useLocation().pathname.split('/')[2]]//有子目录的 useEffect(()=>{ - console.log(1) let pathname_ = pathname == '/' ? homePath : pathname const initKeys = (items, lastKeys) => { for (let it of items) { @@ -93,16 +93,14 @@ const Sider = props => { } } return lastKeys - return { - selectedKeys: [], - openKeys: [] - } } - const lastSelectedKeys = localStorage.getItem('vcmp_selected_sider') - console.log(lastSelectedKeys) - if (lastSelectedKeys) { - setSelectedKeys(JSON.parse(lastSelectedKeys)) - } + + if(routeSelectedKeys[0]){ + setSelectedKeys(routeSelectedKeys) + } + else{ + setSelectedKeys(routeSelectedKey) + } const lastOpenKeys = localStorage.getItem('vcmp_open_sider') if (lastOpenKeys) { setOpenKeys(JSON.parse(lastOpenKeys)) @@ -114,7 +112,6 @@ const Sider = props => { scrollbar.update(); } }) -console.log(selectedKeys,openKeys) return (