From bec75e9bf6e4fb94ffc802c3b45f0b031d93ff88 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Wed, 12 Jul 2023 09:52:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/layout/components/sider/index.js | 2 +- web/client/src/layout/containers/layout/index.js | 1 + web/package.json | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/web/client/src/layout/components/sider/index.js b/web/client/src/layout/components/sider/index.js index d71d0ead..b7b80315 100644 --- a/web/client/src/layout/components/sider/index.js +++ b/web/client/src/layout/components/sider/index.js @@ -62,7 +62,7 @@ const Sider = props => { setSelectedKeys(selectedKeys) }} onOpenChange={(ks) => { - setOpenKeys(ks) + setOpenKeys(ks.length > 1 ? [ks.pop()] : ks) }} > {items} diff --git a/web/client/src/layout/containers/layout/index.js b/web/client/src/layout/containers/layout/index.js index dabb4eea..eb4f2e01 100644 --- a/web/client/src/layout/containers/layout/index.js +++ b/web/client/src/layout/containers/layout/index.js @@ -52,6 +52,7 @@ const LayoutContainer = props => { }) }, [user]) useEffect(() => { + resize_() scrollbar = new PerfectScrollbar('#page-content', { suppressScrollX: true }); }, []) diff --git a/web/package.json b/web/package.json index eae741a7..add7d5a1 100644 --- a/web/package.json +++ b/web/package.json @@ -6,11 +6,7 @@ "scripts": { "test": "mocha", "start": "cross-env NODE_ENV=development npm run start-params", -<<<<<<< Updated upstream "start-params": "node server -p 5000 -u http://localhost:13400 --qndmn http://rfkimpwbb.hn-bkt.clouddn.com --vcmpWebUrl https://mediaconsole.ngaiot.com --vcmpMirrorId 24461524032354", -======= - "start-params": "node server -p 5000 -u http://localhost:13401 --qndmn http://rfkimpwbb.hn-bkt.clouddn.com --vcmpWebUrl https://mediaconsole.ngaiot.com --vcmpMirrorId 24461524032354", ->>>>>>> Stashed changes "deploy": "export NODE_ENV=production&&npm run color && npm run build && node server", "build-dev": "export NODE_ENV=development&&webpack --config webpack.config.js", "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js",