Merge remote-tracking branch 'origin/main' into feature/v1.2灵机空间-内容上传审核_rxd

# Conflicts:
#	pnpm-lock.yaml
#	src/components/_base/navbar/index.vue
#	src/components/text-over-tips/index.vue
#	src/layouts/Basic.vue
#	src/layouts/Page.vue
#	src/main.ts
#	src/router/constants.ts
#	src/router/index.ts
#	src/router/typeings.d.ts
#	src/utils/tools.ts

src/layouts/Basic.vue

@@ -98,7 +98,7 @@ provide('toggleDrawerMenu', () => {
         <a-layout class="layout-content" :style="paddingStyle">
           <base-tab-bar v-if="appStore.tabBar" />
           <a-layout-content class="px-5 py-5">
-            <base-breadcrumb />
+            <!-- <base-breadcrumb /> -->
             <layout-page />
           </a-layout-content>
         </a-layout>
@@ -110,15 +110,11 @@ provide('toggleDrawerMenu', () => {
 <style scoped lang="scss">
 $layout-max-width: 1100px;
 
-.layout {
-  // width: 100%;
-  // height: 100%;
-}
 .layout-navbar {
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 100;
+  z-index: 1000;
   width: 100%;
   height: $navbar-height;
 }
@@ -169,7 +165,7 @@ $layout-max-width: 1100px;
   min-width: 1366px;
   height: 100%;
   overflow-y: hidden;
-  background-color: var(--color-fill-2);
+  background-color: $color-background;
   transition: padding 0.2s cubic-bezier(0.34, 0.69, 0.1, 1);
 }
 </style>