From fae8fb4fe516903b8cac2bd2b22199859de9f1ce Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Tue, 4 Apr 2023 11:02:25 +0800
Subject: [PATCH] =?UTF-8?q?fomatte:=20=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/gen/table.ts                   |   2 +-
 src/hooks/table.ts                     |   2 +-
 src/layout/component/columnsAside.vue  | 429 ++++++++++++-------------
 src/layout/navMenu/horizontal.vue      |   2 +-
 src/views/admin/user/i18n/zh-cn.ts     |  50 +--
 src/views/gen/datasource/form.vue      |   2 +-
 src/views/login/component/mobile.vue   |   1 -
 src/views/login/component/register.vue |   2 +-
 8 files changed, 244 insertions(+), 246 deletions(-)

diff --git a/src/api/gen/table.ts b/src/api/gen/table.ts
index 1c7e6341..96210c2d 100644
--- a/src/api/gen/table.ts
+++ b/src/api/gen/table.ts
@@ -66,7 +66,7 @@ export const useGeneratorVFormApi = (dsName: any, tableName: any) => {
 	});
 };
 
-export const useGeneratorVFormSfcApi = (id:string) => {
+export const useGeneratorVFormSfcApi = (id: string) => {
 	return request({
 		url: '/gen/generator/vform/sfc',
 		method: 'get',
diff --git a/src/hooks/table.ts b/src/hooks/table.ts
index 1e8f79f5..ee900e7c 100644
--- a/src/hooks/table.ts
+++ b/src/hooks/table.ts
@@ -232,7 +232,7 @@ export function useTable(options?: BasicTableProps) {
 			textAlign: 'center',
 			background: 'var(--el-table-row-hover-bg-color)',
 			color: 'var(--el-text-color-primary)',
-		}
+		},
 	};
 
 	return {
diff --git a/src/layout/component/columnsAside.vue b/src/layout/component/columnsAside.vue
index 92fcda30..735e4254 100644
--- a/src/layout/component/columnsAside.vue
+++ b/src/layout/component/columnsAside.vue
@@ -1,54 +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 {RouteRecordRaw} from 'vue-router';
+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';
 
 // 定义变量内容
@@ -56,246 +56,245 @@ 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);
+	width: 70px;
+	height: 100%;
+	background: var(--next-bg-columnsMenuBar);
 
-  ul {
-    position: relative;
+	ul {
+		position: relative;
 
-    .layout-columns-active {
-      color: var(--next-bg-columnsMenuBarColor) !important;
-      transition: 0.3s ease-in-out;
-    }
+		.layout-columns-active {
+			color: var(--next-bg-columnsMenuBarColor) !important;
+			transition: 0.3s ease-in-out;
+		}
 
-    .layout-columns-hover {
-      color: var(--el-color-primary);
+		.layout-columns-hover {
+			color: var(--el-color-primary);
 
-      a {
-        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;
+		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;
-      }
+			&:hover {
+				@extend .layout-columns-hover;
+			}
 
-      .columns-vertical {
-        margin: auto;
+			.columns-vertical {
+				margin: auto;
 
-        .columns-vertical-title {
-          padding-top: 1px;
-        }
-      }
+				.columns-vertical-title {
+					padding-top: 1px;
+				}
+			}
 
-      .columns-horizontal {
-        display: flex;
-        height: 50px;
-        width: 100%;
-        align-items: center;
-        padding: 0 5px;
+			.columns-horizontal {
+				display: flex;
+				height: 50px;
+				width: 100%;
+				align-items: center;
+				padding: 0 5px;
 
-        i {
-          margin-right: 3px;
-        }
+				i {
+					margin-right: 3px;
+				}
 
-        a {
-          display: flex;
+				a {
+					display: flex;
 
-          .columns-horizontal-title {
-            padding-top: 1px;
-          }
-        }
-      }
+					.columns-horizontal-title {
+						padding-top: 1px;
+					}
+				}
+			}
 
-      a {
-        text-decoration: none;
-        color: var(--next-bg-columnsMenuBarColor);
-      }
-    }
+			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-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;
-    }
-  }
+		.columns-card {
+			@extend .columns-round;
+			top: 0;
+			height: 50px;
+			width: 100%;
+			border-radius: 0;
+		}
+	}
 }
 </style>
diff --git a/src/layout/navMenu/horizontal.vue b/src/layout/navMenu/horizontal.vue
index b48e9f7c..7b373fd1 100644
--- a/src/layout/navMenu/horizontal.vue
+++ b/src/layout/navMenu/horizontal.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script setup lang="ts" name="navMenuHorizontal">
-import {  RouteRecordRaw } from 'vue-router';
+import { RouteRecordRaw } from 'vue-router';
 import { useRoutesList } from '/@/stores/routesList';
 import { useThemeConfig } from '/@/stores/themeConfig';
 import other from '/@/utils/other';
diff --git a/src/views/admin/user/i18n/zh-cn.ts b/src/views/admin/user/i18n/zh-cn.ts
index 18670473..19d62a7e 100644
--- a/src/views/admin/user/i18n/zh-cn.ts
+++ b/src/views/admin/user/i18n/zh-cn.ts
@@ -1,27 +1,27 @@
 export default {
-    sysuser: {
-        index: '#',
-        username: '用户名',
-        name: '姓名',
-        phone: '手机号',
-        post: '岗位',
-        role: '角色',
-        lockFlag: '状态',
-        createTime: '创建时间',
-        password: '密码',
-        dept: '部门',
-        email: '邮箱',
-        nickname: '昵称',
-        inputUsernameTip: '请输入用户名',
-        inputPhoneTip: '请输入手机号',
-        inputNameTip: '请输入姓名',
-        importUserTip: '用户导入',
-        deleteDisabledTip: 'admin 不允许被删除',
-        noDataScopeTip: '没有数据权限'
-    },
-    personal: {
-        name: '个人信息',
-        passwordRule: '两次输入密码不一致',
-        passwordScore: '密码等级太低',
-    },
+	sysuser: {
+		index: '#',
+		username: '用户名',
+		name: '姓名',
+		phone: '手机号',
+		post: '岗位',
+		role: '角色',
+		lockFlag: '状态',
+		createTime: '创建时间',
+		password: '密码',
+		dept: '部门',
+		email: '邮箱',
+		nickname: '昵称',
+		inputUsernameTip: '请输入用户名',
+		inputPhoneTip: '请输入手机号',
+		inputNameTip: '请输入姓名',
+		importUserTip: '用户导入',
+		deleteDisabledTip: 'admin 不允许被删除',
+		noDataScopeTip: '没有数据权限',
+	},
+	personal: {
+		name: '个人信息',
+		passwordRule: '两次输入密码不一致',
+		passwordScore: '密码等级太低',
+	},
 };
diff --git a/src/views/gen/datasource/form.vue b/src/views/gen/datasource/form.vue
index 10828fa9..05489a94 100644
--- a/src/views/gen/datasource/form.vue
+++ b/src/views/gen/datasource/form.vue
@@ -90,7 +90,7 @@ const form = reactive({
 	name: '',
 	url: '',
 	username: '',
-	password: '' as string || undefined,
+	password: ('' as string) || undefined,
 	createTime: '',
 	updateTime: '',
 	dsType: '',
diff --git a/src/views/login/component/mobile.vue b/src/views/login/component/mobile.vue
index 665d4cb4..a6b59dd6 100644
--- a/src/views/login/component/mobile.vue
+++ b/src/views/login/component/mobile.vue
@@ -119,4 +119,3 @@ const timeCacl = () => {
 	}, 1000);
 };
 </script>
-
diff --git a/src/views/login/component/register.vue b/src/views/login/component/register.vue
index 48b5da94..be63d1c2 100644
--- a/src/views/login/component/register.vue
+++ b/src/views/login/component/register.vue
@@ -173,4 +173,4 @@ const handleRegister = async () => {
 		loading.value = false;
 	}
 };
-</script>
\ No newline at end of file
+</script>