Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

packages/@core/base/design/src/design-tokens/dark/index.css

@@ -39,6 +39,11 @@
 
   /* Used for success actions such as <message> */
 
+  --info: 180, 1.54%, 12.75%;
+  --info-foreground: 220, 4%, 58%;
+
+  /* Used for success actions such as <message> */
+
   --success: 144 57% 58%;
   --success-foreground: 0 0% 98%;
 

packages/@core/base/design/src/design-tokens/default/index.css

@@ -38,6 +38,11 @@
 
   /* Used for success actions such as <message> */
 
+  --info: 240, 5%, 96%;
+  --info-foreground: 220, 4%, 58%;
+
+  /* Used for success actions such as <message> */
+
   --success: 144 57% 58%;
   --success-foreground: 0 0% 98%;
 

packages/effects/hooks/src/use-design-tokens.ts

@@ -216,7 +216,7 @@ export function useElementPlusDesignTokens() {
           : getCssVariableValue('--destructive-50'),
 
         '--el-color-info-light-8': border,
-        '--el-color-info-light-9': background,
+        '--el-color-info-light-9': getCssVariableValue('--info'), // getCssVariableValue('--secondary'),
 
         '--el-color-primary': getCssVariableValue('--primary-500'),
         '--el-color-primary-dark-2': getCssVariableValue('--primary'),
@@ -258,6 +258,12 @@ export function useElementPlusDesignTokens() {
         '--el-fill-color-blank': background,
         '--el-fill-color-light': getCssVariableValue('--accent'),
         '--el-fill-color-lighter': getCssVariableValue('--accent-lighter'),
+
+        // 解决ElLoading背景色问题
+        '--el-mask-color': isDark.value
+          ? 'rgba(0,0,0,.8)'
+          : 'rgba(255,255,255,.9)',
+
         '--el-text-color-primary': getCssVariableValue('--foreground'),
 
         '--el-text-color-regular': getCssVariableValue('--foreground'),

packages/effects/layouts/src/basic/content/content.vue

@@ -53,13 +53,20 @@ function transformComponent(
   component: VNode,
   route: RouteLocationNormalizedLoadedGeneric,
 ) {
+  // 组件视图未找到，如果有设置后备视图，则返回后备视图，如果没有，则抛出错误
+  if (!component) {
+    console.error(
+      'Component view not found，please check the route configuration',
+    );
+    return undefined;
+  }
+
   const routeName = route.name as string;
   // 如果组件没有 name，则直接返回
   if (!routeName) {
     return component;
   }
-
-  const componentName = (component.type as any).name;
+  const componentName = (component?.type as any)?.name;
 
   // 已经设置过 name，则直接返回
   if (componentName) {

packages/effects/layouts/src/widgets/global-search/search-panel.vue

@@ -150,7 +150,7 @@ function removeItem(index: number) {
   } else {
     searchHistory.value.splice(index, 1);
   }
-  activeIndex.value = activeIndex.value - 1 >= 0 ? activeIndex.value - 1 : 0;
+  activeIndex.value = Math.max(activeIndex.value - 1, 0);
   scrollIntoView();
 }
 

packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue

@@ -174,12 +174,15 @@ if (enableShortcutKey.value) {
         />
         <div class="ml-2 w-full">
           <div
+            v-if="tagText || text || $slots.tagText"
             class="text-foreground mb-1 flex items-center text-sm font-medium"
           >
             {{ text }}
-            <Badge class="ml-2 text-green-400">
-              {{ tagText }}
-            </Badge>
+            <slot name="tagText">
+              <Badge v-if="tagText" class="ml-2 text-green-400">
+                {{ tagText }}
+              </Badge>
+            </slot>
           </div>
           <div class="text-muted-foreground text-xs font-normal">
             {{ description }}
@@ -208,7 +211,7 @@ if (enableShortcutKey.value) {
           {{ altView }} L
         </DropdownMenuShortcut>
       </DropdownMenuItem>
-      <DropdownMenuSeparator />
+      <DropdownMenuSeparator v-if="preferences.widget.lockScreen" />
       <DropdownMenuItem
         class="mx-1 flex cursor-pointer items-center rounded-sm py-1 leading-8"
         @click="handleLogout"

packages/stores/src/modules/tabbar.ts

@@ -209,7 +209,7 @@ export const useTabbarStore = defineStore('core-tabbar', {
         (item) => getTabPath(item) === getTabPath(tab),
       );
 
-      if (index >= 0 && index < this.tabs.length - 1) {
+      if (index !== -1 && index < this.tabs.length - 1) {
         const rightTabs = this.tabs.slice(index + 1);
 
         const paths: string[] = [];