fix: bugs

xingyu4j
1 parent 77067a11
Showing 2 changed files with 17 additions and 2 deletions
yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts
yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
-import { reactive } from 'vue'
+import { computed, reactive } from 'vue'
 import { VxeGridProps } from 'vxe-table'
+import { useAppStore } from '@/store/modules/app'
+
+const appStore = useAppStore()
+
+const currentSize = computed(() => {
+  if (appStore.getCurrentSize === 'small') {
+    return 'small'
+  } else if (appStore.getCurrentSize === 'large') {
+    return 'mini'
+  } else {
+    return 'medium'
+  }
+})
  
 export const useVxeGrid = (allSchemas, getPageApi) => {
   const gridOptions = reactive<VxeGridProps>({
     loading: false,
+    size: currentSize.value,
     height: 800,
     rowConfig: {
       keyField: 'id',
+      isCurrent: true,
       isHover: true
     },
     toolbarConfig: {
@@ -125,7 +125,7 @@ const handleLogin = async (params) =&gt; {
       redirect.value = '/'
     }
     push({ path: redirect.value || permissionStore.addRouters[0].path })
-  } finally {
+  } catch {
     loginLoading.value = false
   }
 }