From 57e33781d18c8d04fdbe0301ce06f3e4cf1f8752 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 4 Dec 2024 17:48:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=BB=98=E8=AE=A4=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/business/auth.ts                  |  4 +-
 src/layouts/modules/global-header/index.vue |  2 +-
 src/store/modules/auth/shared.ts            |  1 -
 src/theme/settings.ts                       |  8 +--
 src/typings/api.d.ts                        |  1 -
 src/views/function/toggle-auth/index.vue    | 61 +--------------------
 6 files changed, 8 insertions(+), 69 deletions(-)

diff --git a/src/hooks/business/auth.ts b/src/hooks/business/auth.ts
index d324223..9baeb0b 100644
--- a/src/hooks/business/auth.ts
+++ b/src/hooks/business/auth.ts
@@ -9,10 +9,10 @@ export function useAuth() {
     }
 
     if (typeof codes === 'string') {
-      return authStore.userInfo.buttons.includes(codes);
+      return authStore.userInfo.permissions.includes(codes);
     }
 
-    return codes.some(code => authStore.userInfo.buttons.includes(code));
+    return codes.some(code => authStore.userInfo.permissions.includes(code));
   }
 
   function hasRole(role: string | string[]) {
diff --git a/src/layouts/modules/global-header/index.vue b/src/layouts/modules/global-header/index.vue
index 05a4bf0..d5550ea 100644
--- a/src/layouts/modules/global-header/index.vue
+++ b/src/layouts/modules/global-header/index.vue
@@ -57,7 +57,7 @@ const headerMenus = computed(() => {
       <GlobalBreadcrumb v-if="!appStore.isMobile" class="ml-12px" />
     </div>
     <div class="h-full flex-y-center justify-end">
-      <LangSwitch :lang="appStore.locale" :lang-options="appStore.localeOptions" @change-lang="appStore.changeLocale" />
+      <LangSwitch :lang="appStore.locale" :lang-options="appStore.localeOptions" @change-lang="appStore.changeLocale" v-if="hasRole('super')"/>
       <FullScreen v-if="!appStore.isMobile" :full="isFullscreen" @click="toggle" />
       <ThemeSchemaSwitch
         :theme-schema="themeStore.themeScheme"
diff --git a/src/store/modules/auth/shared.ts b/src/store/modules/auth/shared.ts
index bc0ab24..917b208 100644
--- a/src/store/modules/auth/shared.ts
+++ b/src/store/modules/auth/shared.ts
@@ -7,7 +7,6 @@ export function getToken() {
 
 export const emptyInfo: Api.Auth.UserInfo = {
   roles: [],
-  buttons: [],
   permissions: [],
   user: null
 };
diff --git a/src/theme/settings.ts b/src/theme/settings.ts
index 49e7942..c787ad0 100644
--- a/src/theme/settings.ts
+++ b/src/theme/settings.ts
@@ -1,10 +1,10 @@
 /** Default theme settings */
 export const themeSettings: App.Theme.ThemeSetting = {
-  themeScheme: 'light',
-  themeColor: '#646cff',
-  otherColor: { info: '#2080f0', success: '#52c41a', warning: '#faad14', error: '#f5222d' },
+  themeScheme: 'auto',
+  themeColor: '#3B82F6',
+  otherColor: { info: '#3B82F6', success: '#52c41a', warning: '#faad14', error: '#f5222d' },
   isInfoFollowPrimary: true,
-  layout: { mode: 'vertical-mix', scrollMode: 'content' },
+  layout: { mode: 'horizontal-mix', scrollMode: 'content' },
   page: { animate: true, animateMode: 'fade-slide' },
   header: { height: 56, breadcrumb: { visible: true, showIcon: true } },
   tab: { visible: false, cache: true, height: 44, mode: 'chrome' },
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 2aa40fe..99554e0 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -81,7 +81,6 @@ declare namespace Api {
     interface UserInfo {
       user: User | null;
       roles: string[];
-      buttons: string[];
       /** permissions */
       permissions: string[];
     }
diff --git a/src/views/function/toggle-auth/index.vue b/src/views/function/toggle-auth/index.vue
index a66c85b..cdb966a 100644
--- a/src/views/function/toggle-auth/index.vue
+++ b/src/views/function/toggle-auth/index.vue
@@ -1,56 +1,10 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
-import { useLoading } from '@sa/hooks';
 import { $t } from '@/locales';
-import { useAppStore } from '@/store/modules/app';
 import { useAuthStore } from '@/store/modules/auth';
 import { useAuth } from '@/hooks/business/auth';
 
-const appStore = useAppStore();
 const authStore = useAuthStore();
 const { hasAuth } = useAuth();
-const { loading, startLoading, endLoading } = useLoading();
-
-type AccountKey = 'super' | 'admin' | 'user';
-
-interface Account {
-  key: AccountKey;
-  label: string;
-  username: string;
-  password: string;
-}
-
-const accounts = computed<Account[]>(() => [
-  {
-    key: 'super',
-    label: $t('page.login.pwdLogin.superAdmin'),
-    username: 'Super',
-    password: '123456'
-  },
-  {
-    key: 'admin',
-    label: $t('page.login.pwdLogin.admin'),
-    username: 'Admin',
-    password: '123456'
-  },
-  {
-    key: 'user',
-    label: $t('page.login.pwdLogin.user'),
-    username: 'User',
-    password: '123456'
-  }
-]);
-
-const loginAccount = ref<AccountKey>('super');
-
-async function handleToggleAccount(account: Account) {
-  loginAccount.value = account.key;
-
-  startLoading();
-  await authStore.login(account.username, account.password, false);
-  endLoading();
-  appStore.reloadPage();
-}
 </script>
 
 <template>
@@ -62,24 +16,11 @@ async function handleToggleAccount(account: Account) {
             <ATag v-for="role in authStore.userInfo.roles" :key="role">{{ role }}</ATag>
           </ASpace>
         </ADescriptionsItem>
-        <ADescriptionsItem ions-item :label="$t('page.function.toggleAuth.toggleAccount')">
-          <ASpace>
-            <AButton
-              v-for="account in accounts"
-              :key="account.key"
-              :loading="loading && loginAccount === account.key"
-              :disabled="loading && loginAccount !== account.key"
-              @click="handleToggleAccount(account)"
-            >
-              {{ account.label }}
-            </AButton>
-          </ASpace>
-        </ADescriptionsItem>
       </ADescriptions>
     </ACard>
     <ACard :title="$t('page.function.toggleAuth.authHook')" :bordered="false" size="small" class="card-wrapper">
       <ASpace>
-        <AButton v-if="hasAuth('B_CODE1')">{{ $t('page.function.toggleAuth.superAdminVisible') }}</AButton>
+        <AButton v-if="hasAuth('*:*:*')">{{ $t('page.function.toggleAuth.superAdminVisible') }}</AButton>
         <AButton v-if="hasAuth('B_CODE2')">{{ $t('page.function.toggleAuth.adminVisible') }}</AButton>
         <AButton v-if="hasAuth('B_CODE3')">
           {{ $t('page.function.toggleAuth.adminOrUserVisible') }}