From 81b88795c07088ec2854e517b987a775f55a20fc Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Wed, 29 Mar 2023 20:46:36 +0800
Subject: [PATCH] up element 2.3.1

---
 package-lock.json                            |  17 +-
 package.json                                 |   2 +-
 src/App.vue                                  |   3 -
 src/api/login/index.ts                       |  10 +-
 src/layout/component/columnsAside.vue        | 446 ++++++++++---------
 src/layout/component/main.vue                |   3 -
 src/layout/main/classic.vue                  |   3 -
 src/layout/main/columns.vue                  |   3 -
 src/layout/main/defaults.vue                 |   3 -
 src/layout/main/transverse.vue               |   3 -
 src/layout/navBars/breadcrumb/breadcrumb.vue |   3 -
 src/layout/navBars/breadcrumb/index.vue      |   3 -
 src/layout/navBars/breadcrumb/search.vue     |   3 -
 src/layout/navBars/breadcrumb/user.vue       |   2 -
 src/layout/navBars/tagsView/tagsView.vue     |   2 -
 src/layout/navMenu/horizontal.vue            |   4 +-
 src/layout/navMenu/vertical.vue              |   4 +-
 src/layout/routerView/iframes.vue            |   3 -
 src/layout/routerView/link.vue               |   2 -
 src/layout/routerView/parent.vue             |   3 -
 src/router/frontEnd.ts                       |   1 -
 src/views/error/404.vue                      |   2 -
 src/views/gen/gener/index.vue                |   3 -
 src/views/gen/table/index.vue                |   1 -
 src/views/home/schedule/calendar.vue         |   2 +-
 25 files changed, 249 insertions(+), 282 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8d4bdf39..badbc98e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
 				"axios": "^1.3.3",
 				"crypto-js": "^3.1.9-1",
 				"echarts": "^5.4.1",
-				"element-plus": "^2.2.32",
+				"element-plus": "2.3.1",
 				"form-designer": "^0.0.2",
 				"highlight.js": "^11.7.0",
 				"js-cookie": "^3.0.1",
@@ -1736,9 +1736,9 @@
 			}
 		},
 		"node_modules/element-plus": {
-			"version": "2.2.33",
-			"resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.33.tgz",
-			"integrity": "sha512-E/PmMnv4+4I9Ue0ZDfx2gGgGj4iBlTCWcES3o4jxfYjayFlcQO3UvElJzhaJZ8vDm9yfNN7t2w/xYOhsSYCNNg==",
+			"version": "2.3.1",
+			"resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.3.1.tgz",
+			"integrity": "sha512-IBS7ic1mRyDXpOreRkredV4ByZSuax5HPb0zNOHm4qwKC4wm927yQv+Is0JbzxPzCW5zWaV4PLy9/Gl3E3v59w==",
 			"license": "MIT",
 			"dependencies": {
 				"@ctrl/tinycolor": "^3.4.1",
@@ -1756,6 +1756,9 @@
 				"lodash-unified": "^1.0.2",
 				"memoize-one": "^6.0.0",
 				"normalize-wheel-es": "^1.2.0"
+			},
+			"peerDependencies": {
+				"vue": "^3.2.0"
 			}
 		},
 		"node_modules/emoji-regex": {
@@ -5720,9 +5723,9 @@
 			}
 		},
 		"element-plus": {
-			"version": "2.2.33",
-			"resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.33.tgz",
-			"integrity": "sha512-E/PmMnv4+4I9Ue0ZDfx2gGgGj4iBlTCWcES3o4jxfYjayFlcQO3UvElJzhaJZ8vDm9yfNN7t2w/xYOhsSYCNNg==",
+			"version": "2.3.1",
+			"resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.3.1.tgz",
+			"integrity": "sha512-IBS7ic1mRyDXpOreRkredV4ByZSuax5HPb0zNOHm4qwKC4wm927yQv+Is0JbzxPzCW5zWaV4PLy9/Gl3E3v59w==",
 			"requires": {
 				"@ctrl/tinycolor": "^3.4.1",
 				"@element-plus/icons-vue": "^2.0.6",
diff --git a/package.json b/package.json
index 950bfe97..a04c29a2 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
 		"axios": "^1.3.3",
 		"crypto-js": "^3.1.9-1",
 		"echarts": "^5.4.1",
-		"element-plus": "^2.2.32",
+		"element-plus": "2.3.1",
 		"form-designer": "^0.0.2",
 		"highlight.js": "^11.7.0",
 		"js-cookie": "^3.0.1",
diff --git a/src/App.vue b/src/App.vue
index bbfcd893..0354d1d3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,10 +8,7 @@
 </template>
 
 <script setup lang="ts" name="app">
-import { defineAsyncComponent, computed, ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch } from 'vue';
-import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { storeToRefs } from 'pinia';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import other from '/@/utils/other';
diff --git a/src/api/login/index.ts b/src/api/login/index.ts
index 68264055..fd6e87a3 100644
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -15,7 +15,7 @@ export const login = (data: any) => {
 		method: 'post',
 		params: data,
 		headers: {
-			isToken: false,
+			skipToken: true,
 			'TENANT-ID': '1',
 			Authorization: basicAuth,
 		},
@@ -31,7 +31,7 @@ export const loginByMobile = (mobile: any, code: any) => {
 	return request({
 		url: '/auth/oauth2/token',
 		headers: {
-			isToken: false,
+			skipToken: true,
 			'TENANT-ID': '1',
 			Authorization: basicAuth,
 		},
@@ -49,7 +49,7 @@ export const loginBySocial = (state: string, code: string) => {
 	return request({
 		url: '/auth/oauth2/token',
 		headers: {
-			isToken: false,
+			skipToken: true,
 			'TENANT-ID': '1',
 			Authorization: basicAuth,
 		},
@@ -74,7 +74,7 @@ export const refreshTokenApi = (refresh_token: string) => {
 	return request({
 		url: '/auth/oauth2/token',
 		headers: {
-			isToken: false,
+			skipToken: true,
 			'TENANT-ID': '1',
 			Authorization: basicAuth,
 		},
@@ -92,7 +92,7 @@ export const checkToken = (refreshTime: number, refreshLock: boolean) => {
 	request({
 		url: '/auth/token/check_token',
 		headers: {
-			isToken: false,
+			skipToken: true,
 			Authorization: basicAuth,
 		},
 		method: 'get',
diff --git a/src/layout/component/columnsAside.vue b/src/layout/component/columnsAside.vue
index 6e4054c5..92fcda30 100644
--- a/src/layout/component/columnsAside.vue
+++ b/src/layout/component/columnsAside.vue
@@ -1,56 +1,54 @@
 <template>
-	<div class="layout-columns-aside">
-		<el-scrollbar>
-			<ul @mouseleave="onColumnsAsideMenuMouseleave()">
-				<li
-					v-for="(v, k) in state.columnsAsideList"
-					:key="k"
-					@click="onColumnsAsideMenuClick(v, k)"
-					@mouseenter="onColumnsAsideMenuMouseenter(v, k)"
-					:ref="
+  <div class="layout-columns-aside">
+    <el-scrollbar>
+      <ul @mouseleave="onColumnsAsideMenuMouseleave()">
+        <li
+            v-for="(v, k) in state.columnsAsideList"
+            :key="k"
+            @click="onColumnsAsideMenuClick(v, k)"
+            @mouseenter="onColumnsAsideMenuMouseenter(v, k)"
+            :ref="
 						(el) => {
 							if (el) columnsAsideOffsetTopRefs[k] = el;
 						}
 					"
-					:class="{ 'layout-columns-active': state.liIndex === k, 'layout-columns-hover': state.liHoverIndex === k }"
-					:title="$t(v.name)"
-				>
-					<div :class="themeConfig.columnsAsideLayout" v-if="!v.meta.isLink || (v.meta.isLink && v.meta.isIframe)">
-						<SvgIcon :name="v.meta.icon" />
-						<div class="columns-vertical-title font12">
-							{{
-								$t(v.name) && $t(v.name).length >= 4
-									? $t(v.name).substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
-									: $t(v.name)
-							}}
-						</div>
-					</div>
-					<div :class="themeConfig.columnsAsideLayout" v-else>
-						<a :href="v.meta.isLink" target="_blank">
-							<SvgIcon :name="v.meta.icon" />
-							<div class="columns-vertical-title font12">
-								{{
-									$t(v.name) && $t(v.name).length >= 4
-										? $t(v.name).substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
-										: $t(v.name)
-								}}
-							</div>
-						</a>
-					</div>
-				</li>
-				<div ref="columnsAsideActiveRef" :class="themeConfig.columnsAsideStyle"></div>
-			</ul>
-		</el-scrollbar>
-	</div>
+            :class="{ 'layout-columns-active': state.liIndex === k, 'layout-columns-hover': state.liHoverIndex === k }"
+            :title="$t(v.name)"
+        >
+          <div :class="themeConfig.columnsAsideLayout" v-if="!v.meta.isLink || (v.meta.isLink && v.meta.isIframe)">
+            <SvgIcon :name="v.meta.icon"/>
+            <div class="columns-vertical-title font12">
+              {{
+                $t(v.name) && $t(v.name).length >= 4
+                    ? $t(v.name).substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
+                    : $t(v.name)
+              }}
+            </div>
+          </div>
+          <div :class="themeConfig.columnsAsideLayout" v-else>
+            <a :href="v.meta.isLink" target="_blank">
+              <SvgIcon :name="v.meta.icon"/>
+              <div class="columns-vertical-title font12">
+                {{
+                  $t(v.name) && $t(v.name).length >= 4
+                      ? $t(v.name).substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
+                      : $t(v.name)
+                }}
+              </div>
+            </a>
+          </div>
+        </li>
+        <div ref="columnsAsideActiveRef" :class="themeConfig.columnsAsideStyle"></div>
+      </ul>
+    </el-scrollbar>
+  </div>
 </template>
 
 <script setup lang="ts" name="layoutColumnsAside">
-import { reactive, ref, onMounted, nextTick, watch, onUnmounted } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
-import { storeToRefs } from 'pinia';
+import {RouteRecordRaw} from 'vue-router';
 import pinia from '/@/stores/index';
-import { useRoutesList } from '/@/stores/routesList';
-import { useThemeConfig } from '/@/stores/themeConfig';
+import {useRoutesList} from '/@/stores/routesList';
+import {useThemeConfig} from '/@/stores/themeConfig';
 import mittBus from '/@/utils/mitt';
 
 // 定义变量内容
@@ -58,230 +56,246 @@ const columnsAsideOffsetTopRefs = ref<RefType>([]);
 const columnsAsideActiveRef = ref();
 const stores = useRoutesList();
 const storesThemeConfig = useThemeConfig();
-const { routesList, isColumnsMenuHover, isColumnsNavHover } = storeToRefs(stores);
-const { themeConfig } = storeToRefs(storesThemeConfig);
+const {routesList, isColumnsMenuHover, isColumnsNavHover} = storeToRefs(stores);
+const {themeConfig} = storeToRefs(storesThemeConfig);
 const route = useRoute();
 const router = useRouter();
 const state = reactive<ColumnsAsideState>({
-	columnsAsideList: [],
-	liIndex: 0,
-	liOldIndex: null,
-	liHoverIndex: null,
-	liOldPath: null,
-	difference: 0,
-	routeSplit: [],
+  columnsAsideList: [],
+  liIndex: 0,
+  liOldIndex: null,
+  liHoverIndex: null,
+  liOldPath: null,
+  difference: 0,
+  routeSplit: [],
 });
 
 // 设置菜单高亮位置移动
 const setColumnsAsideMove = (k: number) => {
-	state.liIndex = k;
-	columnsAsideActiveRef.value.style.top = `${columnsAsideOffsetTopRefs.value[k].offsetTop + state.difference}px`;
+  state.liIndex = k;
+  columnsAsideActiveRef.value.style.top = `${columnsAsideOffsetTopRefs.value[k].offsetTop + state.difference}px`;
 };
 // 菜单高亮点击事件
 const onColumnsAsideMenuClick = (v: RouteItem, k: number) => {
-	setColumnsAsideMove(k);
-	let { path, redirect } = v;
-	if (redirect) router.push(redirect);
-	else router.push(path);
+  setColumnsAsideMove(k);
+  let {path, redirect} = v;
+  if (redirect) router.push(redirect);
+  else router.push(path);
 };
 // 鼠标移入时，显示当前的子级菜单
 const onColumnsAsideMenuMouseenter = (v: RouteRecordRaw, k: number) => {
-	if (!themeConfig.value.isColumnsMenuHoverPreload) return false;
-	let { path } = v;
-	state.liOldPath = path;
-	state.liOldIndex = k;
-	state.liHoverIndex = k;
-	mittBus.emit('setSendColumnsChildren', setSendChildren(path));
-	stores.setColumnsMenuHover(false);
-	stores.setColumnsNavHover(true);
+  if (!themeConfig.value.isColumnsMenuHoverPreload) return false;
+  let {path} = v;
+  state.liOldPath = path;
+  state.liOldIndex = k;
+  state.liHoverIndex = k;
+  mittBus.emit('setSendColumnsChildren', setSendChildren(path));
+  stores.setColumnsMenuHover(false);
+  stores.setColumnsNavHover(true);
 };
 // 鼠标移走时，显示原来的子级菜单
 const onColumnsAsideMenuMouseleave = async () => {
-	await stores.setColumnsNavHover(false);
-	// 添加延时器，防止拿到的 store.state.routesList 值不是最新的
-	setTimeout(() => {
-		if (!isColumnsMenuHover && !isColumnsNavHover) mittBus.emit('restoreDefault');
-	}, 100);
+  await stores.setColumnsNavHover(false);
+  // 添加延时器，防止拿到的 store.state.routesList 值不是最新的
+  setTimeout(() => {
+    if (!isColumnsMenuHover && !isColumnsNavHover) mittBus.emit('restoreDefault');
+  }, 100);
 };
 // 设置高亮动态位置
 const onColumnsAsideDown = (k: number) => {
-	nextTick(() => {
-		setColumnsAsideMove(k);
-	});
+  nextTick(() => {
+    setColumnsAsideMove(k);
+  });
 };
 // 设置/过滤路由（非静态路由/是否显示在菜单中）
 const setFilterRoutes = () => {
-	state.columnsAsideList = filterRoutesFun(routesList.value);
-	const resData: MittMenu = setSendChildren(route.path);
-	if (Object.keys(resData).length <= 0) return false;
-	onColumnsAsideDown(resData.item?.k);
-	mittBus.emit('setSendColumnsChildren', resData);
+  state.columnsAsideList = filterRoutesFun(routesList.value);
+  const resData: MittMenu = setSendChildren(route.path);
+  if (Object.keys(resData).length <= 0) return false;
+  onColumnsAsideDown(resData.item?.k);
+  mittBus.emit('setSendColumnsChildren', resData);
 };
 // 传送当前子级数据到菜单中
 const setSendChildren = (path: string) => {
-	const parentRoute = searchParent(routesList.value, path) as any;
-	let currentData: MittMenu = { children: [] };
-	state.columnsAsideList.map((v: RouteItem, k: number) => {
-		if (v.path === parentRoute.path) {
-			v['k'] = k;
-			currentData['item'] = { ...v };
-			currentData['children'] = [{ ...v }];
-			if (v.children) currentData['children'] = v.children;
-		}
-	});
-	return currentData;
+  const parentRoute = searchParent(routesList.value, path) as any;
+  let currentData: MittMenu = {children: []};
+  state.columnsAsideList.map((v: RouteItem, k: number) => {
+    if (v.path === parentRoute.path) {
+      v['k'] = k;
+      currentData['item'] = {...v};
+      currentData['children'] = [{...v}];
+      if (v.children) currentData['children'] = v.children;
+    }
+  });
+  return currentData;
 };
 // 路由过滤递归函数
 const filterRoutesFun = <T extends RouteItem>(arr: T[]): T[] => {
-	return arr
-		.filter((item: T) => !item.meta?.isHide)
-		.map((item: T) => {
-			item = Object.assign({}, item);
-			if (item.children) item.children = filterRoutesFun(item.children);
-			return item;
-		});
+  return arr
+      .filter((item: T) => !item.meta?.isHide)
+      .map((item: T) => {
+        item = Object.assign({}, item);
+        if (item.children) item.children = filterRoutesFun(item.children);
+        return item;
+      });
 };
 // tagsView 点击时，根据路由查找下标 columnsAsideList，实现左侧菜单高亮
 const setColumnsMenuHighlight = (path: string) => {
-	const parentRoute = searchParent(routesList.value, path) as any;
-	const currentSplitRoute = state.columnsAsideList.find((v: RouteItem) => v.path === parentRoute.path);
-	if (!currentSplitRoute) return false;
-	// 延迟拿值，防止取不到
-	setTimeout(() => {
-		onColumnsAsideDown(currentSplitRoute.k);
-	}, 0);
+  const parentRoute = searchParent(routesList.value, path) as any;
+  const currentSplitRoute = state.columnsAsideList.find((v: RouteItem) => v.path === parentRoute.path);
+  if (!currentSplitRoute) return false;
+  // 延迟拿值，防止取不到
+  setTimeout(() => {
+    onColumnsAsideDown(currentSplitRoute.k);
+  }, 0);
 };
 
 // 使用递归查询对应的父级路由
 const searchParent = (routesList: any, path: string) => {
-	let route = undefined;
-	routesList.forEach((item) => {
-		if (item.path === path) {
-			route = item;
-			return;
-		}
-		if (item.children && searchParent(item.children, path)) {
-			route = item;
-			return;
-		}
-	});
-	return route;
+  let route = undefined;
+  routesList.forEach((item) => {
+    if (item.path === path) {
+      route = item;
+      return;
+    }
+    if (item.children && searchParent(item.children, path)) {
+      route = item;
+      return;
+    }
+  });
+  return route;
 };
 
 // 页面加载时
 onMounted(() => {
-	setFilterRoutes();
-	// 销毁变量，防止鼠标再次移入时，保留了上次的记录
-	mittBus.on('restoreDefault', () => {
-		state.liOldIndex = null;
-		state.liOldPath = null;
-	});
+  setFilterRoutes();
+  // 销毁变量，防止鼠标再次移入时，保留了上次的记录
+  mittBus.on('restoreDefault', () => {
+    state.liOldIndex = null;
+    state.liOldPath = null;
+  });
 });
 // 页面卸载时
 onUnmounted(() => {
-	mittBus.off('restoreDefault', () => {});
+  mittBus.off('restoreDefault', () => {
+  });
 });
 // 路由更新时
 onBeforeRouteUpdate((to) => {
-	setColumnsMenuHighlight(to.path);
-	mittBus.emit('setSendColumnsChildren', setSendChildren(to.path));
+  setColumnsMenuHighlight(to.path);
+  mittBus.emit('setSendColumnsChildren', setSendChildren(to.path));
 });
 // 监听布局配置信息的变化，动态增加菜单高亮位置移动像素
 watch(
-	pinia.state,
-	(val) => {
-		val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
-		if (!val.routesList.isColumnsMenuHover && !val.routesList.isColumnsNavHover) {
-			state.liHoverIndex = null;
-			mittBus.emit('setSendColumnsChildren', setSendChildren(route.path));
-		} else {
-			state.liHoverIndex = state.liOldIndex;
-			if (!state.liOldPath) return false;
-			mittBus.emit('setSendColumnsChildren', setSendChildren(state.liOldPath));
-		}
-	},
-	{
-		deep: true,
-	}
+    pinia.state,
+    (val) => {
+      val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
+      if (!val.routesList.isColumnsMenuHover && !val.routesList.isColumnsNavHover) {
+        state.liHoverIndex = null;
+        mittBus.emit('setSendColumnsChildren', setSendChildren(route.path));
+      } else {
+        state.liHoverIndex = state.liOldIndex;
+        if (!state.liOldPath) return false;
+        mittBus.emit('setSendColumnsChildren', setSendChildren(state.liOldPath));
+      }
+    },
+    {
+      deep: true,
+    }
 );
 </script>
 
 <style scoped lang="scss">
 .layout-columns-aside {
-	width: 70px;
-	height: 100%;
-	background: var(--next-bg-columnsMenuBar);
-	ul {
-		position: relative;
-		.layout-columns-active {
-			color: var(--next-bg-columnsMenuBarColor) !important;
-			transition: 0.3s ease-in-out;
-		}
-		.layout-columns-hover {
-			color: var(--el-color-primary);
-			a {
-				color: var(--el-color-primary);
-			}
-		}
-		li {
-			color: var(--next-bg-columnsMenuBarColor);
-			width: 100%;
-			height: 50px;
-			text-align: center;
-			display: flex;
-			cursor: pointer;
-			position: relative;
-			z-index: 1;
-			&:hover {
-				@extend .layout-columns-hover;
-			}
-			.columns-vertical {
-				margin: auto;
-				.columns-vertical-title {
-					padding-top: 1px;
-				}
-			}
-			.columns-horizontal {
-				display: flex;
-				height: 50px;
-				width: 100%;
-				align-items: center;
-				padding: 0 5px;
-				i {
-					margin-right: 3px;
-				}
-				a {
-					display: flex;
-					.columns-horizontal-title {
-						padding-top: 1px;
-					}
-				}
-			}
-			a {
-				text-decoration: none;
-				color: var(--next-bg-columnsMenuBarColor);
-			}
-		}
-		.columns-round {
-			background: var(--el-color-primary);
-			color: var(--el-color-white);
-			position: absolute;
-			left: 50%;
-			top: 2px;
-			height: 44px;
-			width: 65px;
-			transform: translateX(-50%);
-			z-index: 0;
-			transition: 0.3s ease-in-out;
-			border-radius: 5px;
-		}
-		.columns-card {
-			@extend .columns-round;
-			top: 0;
-			height: 50px;
-			width: 100%;
-			border-radius: 0;
-		}
-	}
+  width: 70px;
+  height: 100%;
+  background: var(--next-bg-columnsMenuBar);
+
+  ul {
+    position: relative;
+
+    .layout-columns-active {
+      color: var(--next-bg-columnsMenuBarColor) !important;
+      transition: 0.3s ease-in-out;
+    }
+
+    .layout-columns-hover {
+      color: var(--el-color-primary);
+
+      a {
+        color: var(--el-color-primary);
+      }
+    }
+
+    li {
+      color: var(--next-bg-columnsMenuBarColor);
+      width: 100%;
+      height: 50px;
+      text-align: center;
+      display: flex;
+      cursor: pointer;
+      position: relative;
+      z-index: 1;
+
+      &:hover {
+        @extend .layout-columns-hover;
+      }
+
+      .columns-vertical {
+        margin: auto;
+
+        .columns-vertical-title {
+          padding-top: 1px;
+        }
+      }
+
+      .columns-horizontal {
+        display: flex;
+        height: 50px;
+        width: 100%;
+        align-items: center;
+        padding: 0 5px;
+
+        i {
+          margin-right: 3px;
+        }
+
+        a {
+          display: flex;
+
+          .columns-horizontal-title {
+            padding-top: 1px;
+          }
+        }
+      }
+
+      a {
+        text-decoration: none;
+        color: var(--next-bg-columnsMenuBarColor);
+      }
+    }
+
+    .columns-round {
+      background: var(--el-color-primary);
+      color: var(--el-color-white);
+      position: absolute;
+      left: 50%;
+      top: 2px;
+      height: 44px;
+      width: 65px;
+      transform: translateX(-50%);
+      z-index: 0;
+      transition: 0.3s ease-in-out;
+      border-radius: 5px;
+    }
+
+    .columns-card {
+      @extend .columns-round;
+      top: 0;
+      height: 50px;
+      width: 100%;
+      border-radius: 0;
+    }
+  }
 }
 </style>
diff --git a/src/layout/component/main.vue b/src/layout/component/main.vue
index 013375e8..d9f1e85e 100644
--- a/src/layout/component/main.vue
+++ b/src/layout/component/main.vue
@@ -15,9 +15,6 @@
 </template>
 
 <script setup lang="ts" name="layoutMain">
-import { defineAsyncComponent, onMounted, computed, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import { storeToRefs } from 'pinia';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { NextLoading } from '/@/utils/loading';
diff --git a/src/layout/main/classic.vue b/src/layout/main/classic.vue
index 56d3b8e1..c142c067 100644
--- a/src/layout/main/classic.vue
+++ b/src/layout/main/classic.vue
@@ -12,9 +12,6 @@
 </template>
 
 <script setup lang="ts" name="layoutClassic">
-import { defineAsyncComponent, computed, ref, watch, nextTick, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
-import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 
 // 引入组件
diff --git a/src/layout/main/columns.vue b/src/layout/main/columns.vue
index 918567de..22c0ff5a 100644
--- a/src/layout/main/columns.vue
+++ b/src/layout/main/columns.vue
@@ -12,9 +12,6 @@
 </template>
 
 <script setup lang="ts" name="layoutColumns">
-import { defineAsyncComponent, watch, onMounted, nextTick, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 
 // 引入组件
diff --git a/src/layout/main/defaults.vue b/src/layout/main/defaults.vue
index 5a9a16c5..17497d81 100644
--- a/src/layout/main/defaults.vue
+++ b/src/layout/main/defaults.vue
@@ -11,9 +11,6 @@
 </template>
 
 <script setup lang="ts" name="layoutDefaults">
-import { defineAsyncComponent, watch, onMounted, nextTick, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { NextLoading } from '/@/utils/loading';
 
diff --git a/src/layout/main/transverse.vue b/src/layout/main/transverse.vue
index 1cd7773c..0cde2516 100644
--- a/src/layout/main/transverse.vue
+++ b/src/layout/main/transverse.vue
@@ -6,9 +6,6 @@
 </template>
 
 <script setup lang="ts" name="layoutTransverse">
-import { defineAsyncComponent, ref, watch, nextTick, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
-import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 
 // 引入组件
diff --git a/src/layout/navBars/breadcrumb/breadcrumb.vue b/src/layout/navBars/breadcrumb/breadcrumb.vue
index 842783e5..b02235ba 100644
--- a/src/layout/navBars/breadcrumb/breadcrumb.vue
+++ b/src/layout/navBars/breadcrumb/breadcrumb.vue
@@ -24,11 +24,8 @@
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumb">
-import { reactive, computed, onMounted } from 'vue';
-import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
 import { Local } from '/@/utils/storage';
 import other from '/@/utils/other';
-import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { useRoutesList } from '/@/stores/routesList';
 
diff --git a/src/layout/navBars/breadcrumb/index.vue b/src/layout/navBars/breadcrumb/index.vue
index 29bd1bcc..cb7d0bad 100644
--- a/src/layout/navBars/breadcrumb/index.vue
+++ b/src/layout/navBars/breadcrumb/index.vue
@@ -8,9 +8,6 @@
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbIndex">
-import { defineAsyncComponent, computed, reactive, onMounted, onUnmounted } from 'vue';
-import { useRoute } from 'vue-router';
-import { storeToRefs } from 'pinia';
 import { useRoutesList } from '/@/stores/routesList';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import mittBus from '/@/utils/mitt';
diff --git a/src/layout/navBars/breadcrumb/search.vue b/src/layout/navBars/breadcrumb/search.vue
index d37a38e1..0789a694 100644
--- a/src/layout/navBars/breadcrumb/search.vue
+++ b/src/layout/navBars/breadcrumb/search.vue
@@ -28,10 +28,7 @@
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbSearch">
-import { reactive, ref, nextTick } from 'vue';
-import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { storeToRefs } from 'pinia';
 import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
 
 // 定义变量内容
diff --git a/src/layout/navBars/breadcrumb/user.vue b/src/layout/navBars/breadcrumb/user.vue
index 9278f565..aa04e5a7 100644
--- a/src/layout/navBars/breadcrumb/user.vue
+++ b/src/layout/navBars/breadcrumb/user.vue
@@ -68,8 +68,6 @@
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbUser">
-import { defineAsyncComponent, ref, computed, reactive, onMounted } from 'vue';
-import { useRouter } from 'vue-router';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import screenfull from 'screenfull';
 import { useI18n } from 'vue-i18n';
diff --git a/src/layout/navBars/tagsView/tagsView.vue b/src/layout/navBars/tagsView/tagsView.vue
index 7974fb51..30045688 100644
--- a/src/layout/navBars/tagsView/tagsView.vue
+++ b/src/layout/navBars/tagsView/tagsView.vue
@@ -47,8 +47,6 @@
 </template>
 
 <script setup lang="ts" name="layoutTagsView">
-import { defineAsyncComponent, reactive, onMounted, computed, ref, nextTick, onBeforeUpdate, onBeforeMount, onUnmounted, watch } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import Sortable from 'sortablejs';
 import { ElMessage } from 'element-plus';
 import { storeToRefs } from 'pinia';
diff --git a/src/layout/navMenu/horizontal.vue b/src/layout/navMenu/horizontal.vue
index 004bca1b..b48e9f7c 100644
--- a/src/layout/navMenu/horizontal.vue
+++ b/src/layout/navMenu/horizontal.vue
@@ -31,9 +31,7 @@
 </template>
 
 <script setup lang="ts" name="navMenuHorizontal">
-import { defineAsyncComponent, reactive, computed, onMounted, nextTick, onBeforeMount, ref } from 'vue';
-import { useRoute, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
-import { storeToRefs } from 'pinia';
+import {  RouteRecordRaw } from 'vue-router';
 import { useRoutesList } from '/@/stores/routesList';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import other from '/@/utils/other';
diff --git a/src/layout/navMenu/vertical.vue b/src/layout/navMenu/vertical.vue
index 131a0df4..29631b9e 100644
--- a/src/layout/navMenu/vertical.vue
+++ b/src/layout/navMenu/vertical.vue
@@ -31,9 +31,7 @@
 </template>
 
 <script setup lang="ts" name="navMenuVertical">
-import { defineAsyncComponent, reactive, computed, onMounted, watch } from 'vue';
-import { useRoute, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
-import { storeToRefs } from 'pinia';
+import { RouteRecordRaw } from 'vue-router';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import other from '/@/utils/other';
 
diff --git a/src/layout/routerView/iframes.vue b/src/layout/routerView/iframes.vue
index 8e1f9583..4500092f 100644
--- a/src/layout/routerView/iframes.vue
+++ b/src/layout/routerView/iframes.vue
@@ -21,9 +21,6 @@
 </template>
 
 <script setup lang="ts" name="layoutIframeView">
-import { computed, watch, ref, nextTick } from 'vue';
-import { useRoute } from 'vue-router';
-
 // 定义父组件传过来的值
 const props = defineProps({
 	// 刷新 iframe
diff --git a/src/layout/routerView/link.vue b/src/layout/routerView/link.vue
index 87ceaf9e..5c4434e6 100644
--- a/src/layout/routerView/link.vue
+++ b/src/layout/routerView/link.vue
@@ -14,8 +14,6 @@
 </template>
 
 <script setup lang="ts" name="layoutLinkView">
-import { reactive, watch } from 'vue';
-import { useRoute } from 'vue-router';
 import { verifyUrl } from '/@/utils/toolsValidate';
 
 // 定义变量内容
diff --git a/src/layout/routerView/parent.vue b/src/layout/routerView/parent.vue
index 25aa9b4a..36bbd65a 100644
--- a/src/layout/routerView/parent.vue
+++ b/src/layout/routerView/parent.vue
@@ -17,9 +17,6 @@
 </template>
 
 <script setup lang="ts" name="layoutParentView">
-import { defineAsyncComponent, computed, reactive, onBeforeMount, onUnmounted, nextTick, watch, onMounted } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { storeToRefs } from 'pinia';
 import { useKeepALiveNames } from '/@/stores/keepAliveNames';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import { Session } from '/@/utils/storage';
diff --git a/src/router/frontEnd.ts b/src/router/frontEnd.ts
index 24983a16..1ff984d5 100644
--- a/src/router/frontEnd.ts
+++ b/src/router/frontEnd.ts
@@ -1,5 +1,4 @@
 import { RouteRecordRaw } from 'vue-router';
-import { storeToRefs } from 'pinia';
 import { formatTwoStageRoutes, formatFlatteningRoutes, router } from '/@/router/index';
 import { baseRoutes, notFoundAndNoPower } from '/@/router/route';
 import pinia from '/@/stores/index';
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index cebcd51e..466b5ce1 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -23,8 +23,6 @@
 </template>
 
 <script setup lang="ts" name="notFound">
-import { useRouter } from 'vue-router';
-
 // 定义变量内容
 const router = useRouter();
 
diff --git a/src/views/gen/gener/index.vue b/src/views/gen/gener/index.vue
index 8cecba3b..088ffcea 100644
--- a/src/views/gen/gener/index.vue
+++ b/src/views/gen/gener/index.vue
@@ -28,10 +28,7 @@
 
 <script lang="ts" setup>
 import { useGeneratorCodeApi } from '/@/api/gen/table';
-import { useRoute } from 'vue-router';
 import { downBlobFile } from '/@/utils/other';
-import { useMessage } from '/@/hooks/message';
-import { useI18n } from 'vue-i18n';
 
 const Generator = defineAsyncComponent(() => import('../table/generator.vue'));
 const EditTable = defineAsyncComponent(() => import('../table/edit.vue'));
diff --git a/src/views/gen/table/index.vue b/src/views/gen/table/index.vue
index 0ceb84fe..818478e9 100644
--- a/src/views/gen/table/index.vue
+++ b/src/views/gen/table/index.vue
@@ -59,7 +59,6 @@ import { fetchList, useSyncTableApi, useTableApi } from '/@/api/gen/table';
 import { list } from '/@/api/gen/datasource';
 import { useMessage } from '/@/hooks/message';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 import { validateNull } from '/@/utils/validate';
 
 // 定义变量内容
diff --git a/src/views/home/schedule/calendar.vue b/src/views/home/schedule/calendar.vue
index 0c371903..ac39db0a 100644
--- a/src/views/home/schedule/calendar.vue
+++ b/src/views/home/schedule/calendar.vue
@@ -1,7 +1,7 @@
 <template>
 	<el-calendar v-model="calendar">
 		<template #date-cell="{ data }">
-			<div style="width: 100%; height: 80%" @click="handleSchedule(data)">
+			<div style="width: 100%" @click="handleSchedule(data)">
 				{{ data.day.split('-').slice(2).join('-') }}
 				<span v-if="filterCellSelected(data)">
 					<el-icon><BellFilled /></el-icon>