From 0ca34f6b57682ccf337d98d1d89b210a1f8189cc Mon Sep 17 00:00:00 2001
From: aeizzz <aeizzz@foxmail.com>
Date: Fri, 3 Mar 2023 17:12:53 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20tagsViewName=20?=
 =?UTF-8?q?=E6=AD=A3=E5=88=99=E5=8C=B9=E9=85=8D=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=88=B0=E5=90=ABen=E5=8D=95=E8=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 28 ++++++++++++++--------------
 src/App.vue  | 11 ++++++++++-
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 06d2115e..98043212 100644
--- a/package.json
+++ b/package.json
@@ -15,21 +15,21 @@
     "@highlightjs/vue-plugin": "^2.1.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
-    "axios": "^1.2.1",
+    "axios": "^1.3.3",
     "crypto-js": "^3.1.9-1",
     "echarts": "^5.4.1",
-    "element-plus": "^2.2.26",
+    "element-plus": "^2.2.32",
     "form-designer": "^0.0.2",
     "highlight.js": "^11.7.0",
     "js-cookie": "^3.0.1",
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.28",
+    "pinia": "^2.0.32",
     "qrcode": "1.5.1",
     "qs": "^6.11.0",
     "screenfull": "^6.0.2",
     "sortablejs": "^1.15.0",
-    "vue": "3.2.47",
+    "vue": "^3.2.47",
     "vue-clipboard3": "^2.0.0",
     "vue-i18n": "^9.2.2",
     "vue-router": "^4.1.6",
@@ -37,22 +37,22 @@
     "xe-utils": "^3.5.4"
   },
   "devDependencies": {
-    "@types/node": "^18.11.13",
+    "@types/node": "^18.14.0",
     "@types/nprogress": "^0.2.0",
     "@types/sortablejs": "^1.15.0",
-    "@typescript-eslint/eslint-plugin": "^5.46.0",
-    "@typescript-eslint/parser": "^5.46.0",
+    "@typescript-eslint/eslint-plugin": "^5.53.0",
+    "@typescript-eslint/parser": "^5.53.0",
     "@vitejs/plugin-vue": "^4.0.0",
-    "@vue/compiler-sfc": "^3.2.45",
+    "@vue/compiler-sfc": "^3.2.47",
     "consola": "^2.15.3",
-    "eslint": "8.22.0",
-    "eslint-plugin-vue": "^9.8.0",
+    "eslint": "^8.34.0",
+    "eslint-plugin-vue": "^9.9.0",
     "pinia-plugin-persist": "^1.0.0",
-    "prettier": "^2.8.1",
-    "sass": "^1.56.2",
-    "typescript": "^4.9.4",
+    "prettier": "^2.8.4",
+    "sass": "^1.58.3",
+    "typescript": "^4.9.5",
     "unplugin-auto-import": "^0.13.0",
-    "vite": "^4.0.0",
+    "vite": "^4.1.4",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-style-import": "^2.0.0",
     "vite-plugin-top-level-await": "^1.2.4",
diff --git a/src/App.vue b/src/App.vue
index 1d4cfc9b..9b640279 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-config-provider :size="getGlobalComponentSize" :locale="getGlobalI18n">
-		<router-view v-show="themeConfig.lockScreenTime > 1" />
+		<router-view v-show="setLockScreen" />
 		<LockScreen v-if="themeConfig.isLockScreen" />
 		<Setings ref="setingsRef" v-show="themeConfig.lockScreenTime > 1" />
 		<CloseFull v-if="!themeConfig.isLockScreen" />
@@ -32,6 +32,15 @@ const stores = useTagsViewRoutes();
 const storesThemeConfig = useThemeConfig();
 const { themeConfig } = storeToRefs(storesThemeConfig);
 
+// 设置锁屏时组件显示隐藏
+const setLockScreen = computed(() => {
+  // 防止锁屏后，刷新出现不相关界面
+  // https://gitee.com/lyt-top/vue-next-admin/issues/I6AF8P
+  return themeConfig.value.isLockScreen ? themeConfig.value.lockScreenTime > 1 : themeConfig.value.lockScreenTime >= 0;
+});
+
+
+
 // 获取全局组件大小
 const getGlobalComponentSize = computed(() => {
 	return other.globalComponentSize();