fix: #I5KCI6

yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue

@@ -21,8 +21,7 @@ import {
   getPassword,
   getTenantName
 } from '@/utils/auth'
-import { useUserStoreWithOut } from '@/store/modules/user'
-import { useCache } from '@/hooks/web/useCache'
+import { useUserStore } from '@/store/modules/user'
 import { usePermissionStore } from '@/store/modules/permission'
 import { useRouter } from 'vue-router'
 import { useI18n } from '@/hooks/web/useI18n'
@@ -34,10 +33,9 @@ import { Verify } from '@/components/Verifition'
 
 const { currentRoute, addRoute, push } = useRouter()
 const permissionStore = usePermissionStore()
-const userStore = useUserStoreWithOut()
+const userStore = useUserStore()
 const formLogin = ref()
 const { validForm } = useFormValid(formLogin)
-const { wsCache } = useCache()
 const { setLoginState, getLoginState } = useLoginState()
 const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN)
 const iconSize = 30
@@ -122,13 +120,14 @@ const handleLogin = async (params) => {
 // 获取路由
 const getRoutes = async () => {
   // 后端过滤菜单
-  const res = await LoginApi.getAsyncRoutesApi()
-  wsCache.set('roleRouters', res)
-  await permissionStore.generateRoutes(res)
+  await permissionStore.generateRoutes()
   permissionStore.getAddRouters.forEach((route) => {
     addRoute(route as RouteRecordRaw) // 动态添加可访问路由表
   })
-  permissionStore.setIsAddRouters(true)
+  if (!redirect.value) {
+    redirect.value = '/'
+  }
+  console.info(redirect.value)
   push({ path: redirect.value || permissionStore.addRouters[0].path })
 }
 

yudao-ui-admin-vue3/src/views/Login/components/MobileForm.vue

@@ -5,18 +5,12 @@ import LoginFormTitle from './LoginFormTitle.vue'
 import { ElForm, ElFormItem, ElInput, ElRow, ElCol, ElMessage } from 'element-plus'
 import { useI18n } from '@/hooks/web/useI18n'
 import { required } from '@/utils/formRules'
-import {
-  getTenantIdByNameApi,
-  getAsyncRoutesApi,
-  sendSmsCodeApi,
-  smsLoginApi,
-  getInfoApi
-} from '@/api/login'
+import { getTenantIdByNameApi, sendSmsCodeApi, smsLoginApi, getInfoApi } from '@/api/login'
 import { useCache } from '@/hooks/web/useCache'
 import { usePermissionStore } from '@/store/modules/permission'
 import { useRouter } from 'vue-router'
 import { setToken } from '@/utils/auth'
-import { useUserStoreWithOut } from '@/store/modules/user'
+import { useUserStore } from '@/store/modules/user'
 import type { RouteLocationNormalizedLoaded, RouteRecordRaw } from 'vue-router'
 import { useLoginState, LoginStateEnum, useFormValid } from './useLogin'
 const formSmsLogin = ref()
@@ -27,7 +21,7 @@ const iconHouse = useIcon({ icon: 'ep:house' })
 const iconCellphone = useIcon({ icon: 'ep:cellphone' })
 const iconCircleCheck = useIcon({ icon: 'ep:circle-check' })
 const { wsCache } = useCache()
-const userStore = useUserStoreWithOut()
+const userStore = useUserStore()
 const permissionStore = usePermissionStore()
 const { currentRoute, addRoute, push } = useRouter()
 const loginLoading = ref(false)
@@ -120,13 +114,10 @@ const signIn = async () => {
 // 获取路由
 const getRoutes = async () => {
   // 后端过滤菜单
-  const routers = await getAsyncRoutesApi()
-  wsCache.set('roleRouters', routers)
-  await permissionStore.generateRoutes(routers).catch(() => {})
+  await permissionStore.generateRoutes()
   permissionStore.getAddRouters.forEach((route) => {
     addRoute(route as RouteRecordRaw) // 动态添加可访问路由表
   })
-  permissionStore.setIsAddRouters(true)
   push({ path: redirect.value || permissionStore.addRouters[0].path })
 }
 </script>

yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts

@@ -47,7 +47,8 @@ export const modelSchema = reactive<FormSchema[]>([
   {
     label: '显示排序',
     field: 'sort',
-    component: 'InputNumber'
+    component: 'InputNumber',
+    value: 0
   },
   {
     label: '状态',

yudao-ui-admin-vue3/src/views/system/menu/index.vue

@@ -253,7 +253,7 @@ onMounted(async () => {
     </el-table>
   </ContentWrap>
   <!-- 添加或修改菜单对话框 -->
-  <Dialog v-model="dialogVisible" :title="dialogTitle" maxHeight="400px" width="40%">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" maxHeight="400px" width="45%">
     <el-form
       :model="menuForm"
       :rules="rules"